From 9e93990a994c81374e58ee181df36ba1b36dfe90 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sun, 15 Aug 2021 08:41:33 -0500 Subject: [PATCH 01/56] upgrade gradle version --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ab262faf..6460bdeb 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true } } apply plugin: 'net.minecraftforge.gradle' @@ -151,7 +151,7 @@ dependencies { // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. minecraft "net.minecraftforge:forge:${version_forge}" - compile fg.deobf("simplecore-api:SimpleCoreLib:${simplecorelib_version}") + implementation fg.deobf("simplecore-api:SimpleCoreLib:${simplecorelib_version}") // compile against the JEI API but do not include it at runtime compileOnly fg.deobf("mezz.jei:jei-${version_mcjei}:${jei_version}:api") // at runtime, use the full JEI jar From 6584cb7fbb3e391dc330e03f64d1d9d7f5d31cc5 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sun, 15 Aug 2021 08:43:56 -0500 Subject: [PATCH 02/56] updated .gitignore, prepped for remapping --- .gitignore | 8 +++----- build.gradle | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c6038dfd..c9f766f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ build/ +src/generated/resources/.cache/ gradle/ run/ libs/ @@ -8,14 +9,11 @@ libs/ *.jar *.class *~ -.*.swp .classpath gradlew -build.number gradlew.bat +build.number bin/ .gradle/ -/bin/ -.project .idea/ -src/generated/resources/.cache/cache +.project diff --git a/build.gradle b/build.gradle index 6460bdeb..4d030ba7 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,7 @@ apply plugin: 'net.minecraftforge.gradle' // Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. apply plugin: 'eclipse' apply plugin: 'maven-publish' +apply from: 'https://raw.githubusercontent.com/SizableShrimp/Forge-Class-Remapper/main/classremapper.gradle' def getVersionAppendage() { if (System.env.BUILD_NUMBER) From 6928b1d013259efb6ff752f75baf87b1b708bb32 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sun, 15 Aug 2021 08:46:25 -0500 Subject: [PATCH 03/56] classname remapping complete --- .../netherrocks/ForgeEventSubscriber.java | 12 +- .../netherrocks/ModEventSubscriber.java | 10 +- .../AbstractNetherBlastFurnaceBlock.java | 22 ++- .../content/AbstractNetherFurnaceBlock.java | 2 + .../AbstractNetherFurnaceContainer.java | 6 +- .../AbstractNetherFurnaceTileEntity.java | 28 +-- .../content/AbstractNetherSmokerBlock.java | 20 +- .../client/ClientModEventSubscriber.java | 8 +- .../client/gui/NetherBlastFurnaceScreen.java | 8 +- .../client/gui/NetherFurnaceScreen.java | 8 +- .../client/gui/NetherSmokerScreen.java | 8 +- .../client/jei/JEIMachinePlugin.java | 4 +- .../netherrocks/config/ConfigHelper.java | 14 +- .../netherrocks/content/FyriteArmorItem.java | 24 +-- .../netherrocks/content/FyriteAxeItem.java | 28 +-- .../content/FyritePickaxeIteam.java | 28 +-- .../netherrocks/content/FyriteShovelItem.java | 28 +-- .../netherrocks/content/FyriteSwordItem.java | 20 +- .../content/IllumeniteArmorItem.java | 24 +-- .../content/IllumeniteSwordItem.java | 12 +- .../content/MalachiteArmorItem.java | 34 ++-- .../netherrocks/content/MalachiteAxeItem.java | 12 +- .../content/MalachiteSwordItem.java | 12 +- .../content/NetherBlastFurnaceBlock.java | 42 ++-- .../content/NetherBlastFurnaceContainer.java | 14 +- .../content/NetherBlastFurnaceTileEntity.java | 22 +-- .../content/NetherFurnaceBlock.java | 40 ++-- .../content/NetherFurnaceContainer.java | 14 +- .../content/NetherFurnaceTileEntity.java | 20 +- .../content/NetherSmokerBlock.java | 42 ++-- .../content/NetherSmokerContainer.java | 14 +- .../content/NetherSmokerTileEntity.java | 22 +-- .../content/NetherrocksArmorMaterial.java | 22 +-- .../content/NetherrocksItemTier.java | 12 +- .../netherrocks/datagen/ModBlockTags.java | 2 +- .../netherrocks/datagen/ModItemTags.java | 2 +- .../NetherrocksLootInjectorProvider.java | 186 +++++++++--------- .../datagen/NetherrocksLootTableProvider.java | 8 +- .../netherrocks/datagen/SilentsRecipes.java | 10 +- .../generation/IllumeniteBlobFeature.java | 26 +-- .../netherrocks/generation/OreGeneration.java | 24 +-- .../netherrocks/helpers/FyriteHandler.java | 34 ++-- .../helpers/IllumeniteHandler.java | 14 +- .../netherrocks/helpers/MalachiteHandler.java | 10 +- .../helpers/NetherrocksLootModifiers.java | 22 +-- .../alexndr/netherrocks/init/ModBlocks.java | 12 +- .../netherrocks/init/ModContainers.java | 10 +- .../alexndr/netherrocks/init/ModItems.java | 48 ++--- .../netherrocks/init/ModTabGroups.java | 8 +- .../mod/alexndr/netherrocks/init/ModTags.java | 8 +- .../alexndr/netherrocks/init/ModTiles.java | 16 +- 51 files changed, 554 insertions(+), 522 deletions(-) diff --git a/src/main/java/mod/alexndr/netherrocks/ForgeEventSubscriber.java b/src/main/java/mod/alexndr/netherrocks/ForgeEventSubscriber.java index 6f600256..4ce1bd70 100644 --- a/src/main/java/mod/alexndr/netherrocks/ForgeEventSubscriber.java +++ b/src/main/java/mod/alexndr/netherrocks/ForgeEventSubscriber.java @@ -9,9 +9,9 @@ import mod.alexndr.netherrocks.helpers.NetherrocksInjectionLookup; import mod.alexndr.simplecorelib.helpers.ArmorUtils; import mod.alexndr.simplecorelib.helpers.LootUtils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.DamageSource; -import net.minecraft.world.biome.Biome; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.level.biome.Biome; import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.world.BiomeLoadingEvent; @@ -33,9 +33,9 @@ public final class ForgeEventSubscriber public static void onLivingAttackEvent(LivingAttackEvent event) { // first, is it a player? - if (event.getEntityLiving() instanceof PlayerEntity) + if (event.getEntityLiving() instanceof Player) { - PlayerEntity player = (PlayerEntity) event.getEntityLiving(); + Player player = (Player) event.getEntityLiving(); LOGGER.debug("caught LivingAttackEvent"); // fall damage and are they wearing full illumenite armor? @@ -64,7 +64,7 @@ else if (event.getSource().isFire() @SubscribeEvent(priority=EventPriority.HIGH) public static void onBiomeLoading(BiomeLoadingEvent evt) { - if (evt.getCategory() == Biome.Category.NETHER) + if (evt.getCategory() == Biome.BiomeCategory.NETHER) { OreGeneration.generateNetherOres(evt); } diff --git a/src/main/java/mod/alexndr/netherrocks/ModEventSubscriber.java b/src/main/java/mod/alexndr/netherrocks/ModEventSubscriber.java index fe91622a..2f625a66 100644 --- a/src/main/java/mod/alexndr/netherrocks/ModEventSubscriber.java +++ b/src/main/java/mod/alexndr/netherrocks/ModEventSubscriber.java @@ -13,10 +13,10 @@ import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModTabGroups; import mod.alexndr.simplecorelib.config.FlagCondition; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.util.ResourceLocation; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.loot.GlobalLootModifierSerializer; import net.minecraftforge.event.RegistryEvent; @@ -94,7 +94,7 @@ public static void onRegisterModifierSerializers( @SubscribeEvent public static void onRegisterRecipeSerializers( - @Nonnull final RegistryEvent.Register> event) + @Nonnull final RegistryEvent.Register> event) { CraftingHelper.register(new FlagCondition.Serializer(NetherrocksConfig.INSTANCE, new ResourceLocation(Netherrocks.MODID, "flag"))); diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherBlastFurnaceBlock.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherBlastFurnaceBlock.java index 0c45d6cc..bbdfbae5 100644 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherBlastFurnaceBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherBlastFurnaceBlock.java @@ -2,14 +2,16 @@ import java.util.Random; -import net.minecraft.block.BlockState; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.util.Direction; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.core.Direction; +import net.minecraft.sounds.SoundSource; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.Level; + +import net.minecraft.world.level.block.state.BlockBehaviour.Properties; public abstract class AbstractNetherBlastFurnaceBlock extends AbstractNetherFurnaceBlock { @@ -20,14 +22,14 @@ public AbstractNetherBlastFurnaceBlock(Properties builder) } @Override - public void animateTick(BlockState stateIn, World worldIn, BlockPos pos, Random rand) + public void animateTick(BlockState stateIn, Level worldIn, BlockPos pos, Random rand) { if (stateIn.getValue(BlockStateProperties.LIT)) { double d0 = (double)pos.getX() + 0.5D; double d1 = (double)pos.getY(); double d2 = (double)pos.getZ() + 0.5D; if (rand.nextDouble() < 0.1D) { - worldIn.playLocalSound(d0, d1, d2, SoundEvents.BLASTFURNACE_FIRE_CRACKLE, SoundCategory.BLOCKS, 1.0F, 1.0F, false); + worldIn.playLocalSound(d0, d1, d2, SoundEvents.BLASTFURNACE_FIRE_CRACKLE, SoundSource.BLOCKS, 1.0F, 1.0F, false); } Direction direction = stateIn.getValue(FACING); diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceBlock.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceBlock.java index 7759152c..7f348916 100644 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceBlock.java @@ -2,6 +2,8 @@ import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceBlock; +import net.minecraft.world.level.block.state.BlockBehaviour.Properties; + public abstract class AbstractNetherFurnaceBlock extends VeryAbstractFurnaceBlock { public AbstractNetherFurnaceBlock(Properties builder) diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceContainer.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceContainer.java index 68e2dbb1..020047a3 100644 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceContainer.java +++ b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceContainer.java @@ -3,10 +3,10 @@ import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceContainer; import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceTileEntity; import net.minecraft.client.network.play.ClientPlayNetHandler; -import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.world.entity.player.Inventory; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.ContainerType; +import net.minecraft.world.inventory.MenuType; import net.minecraft.network.play.server.SWindowPropertyPacket; import net.minecraft.util.IntReferenceHolder; import net.minecraftforge.fml.RegistryObject; @@ -26,7 +26,7 @@ public abstract class AbstractNetherFurnaceContainer extends VeryAbstractFurnaceContainer { - public AbstractNetherFurnaceContainer(ContainerType containerType, int id, PlayerInventory playerInventory, + public AbstractNetherFurnaceContainer(MenuType containerType, int id, Inventory playerInventory, VeryAbstractFurnaceTileEntity tileEntity, RegistryObject arg4) { super(containerType, id, playerInventory, tileEntity, arg4); diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java index 2c28432d..30605949 100644 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java +++ b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java @@ -13,21 +13,21 @@ import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.netherrocks.init.ModTags; import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceTileEntity; -import net.minecraft.block.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.item.crafting.AbstractCookingRecipe; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.tags.ITag; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.IItemProvider; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.AbstractCookingRecipe; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.tags.Tag; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.ItemLike; public abstract class AbstractNetherFurnaceTileEntity extends VeryAbstractFurnaceTileEntity { - public AbstractNetherFurnaceTileEntity(TileEntityType tileEntityTypeIn, - IRecipeType recipeTypeIn) + public AbstractNetherFurnaceTileEntity(BlockEntityType tileEntityTypeIn, + RecipeType recipeTypeIn) { super(tileEntityTypeIn, recipeTypeIn); } @@ -82,12 +82,12 @@ public static Map loadBurnTimes() } // end getBurnTimes() protected static void addItemBurnTime(Map map, - IItemProvider itemProvider, int burnTimeIn) + ItemLike itemProvider, int burnTimeIn) { map.put(itemProvider.asItem(), burnTimeIn); } - protected static void addItemTagBurnTime(Map map, ITag iTag, int burnTimeIn) + protected static void addItemTagBurnTime(Map map, Tag iTag, int burnTimeIn) { for(Item item : iTag.getValues()) { map.put(item, burnTimeIn); @@ -100,7 +100,7 @@ protected static void addItemTagBurnTime(Map map, ITag iTag * @param recipeType - ignored * @return burn time in ticks. */ - protected static int getBurnTime(ItemStack stack, @Nullable IRecipeType recipeType) + protected static int getBurnTime(ItemStack stack, @Nullable RecipeType recipeType) { if (AbstractNetherFurnaceTileEntity.burnTimes.isEmpty()) { AbstractNetherFurnaceTileEntity.burnTimes = AbstractNetherFurnaceTileEntity.loadBurnTimes(); diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherSmokerBlock.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherSmokerBlock.java index 847b6c09..bf3c8f22 100644 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherSmokerBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherSmokerBlock.java @@ -2,16 +2,18 @@ import java.util.Random; -import net.minecraft.block.BlockState; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.sounds.SoundSource; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.world.level.block.state.BlockBehaviour.Properties; + public abstract class AbstractNetherSmokerBlock extends AbstractNetherFurnaceBlock { @@ -22,14 +24,14 @@ public AbstractNetherSmokerBlock(Properties builder) @Override @OnlyIn(Dist.CLIENT) - public void animateTick(BlockState stateIn, World worldIn, BlockPos pos, Random rand) + public void animateTick(BlockState stateIn, Level worldIn, BlockPos pos, Random rand) { if (stateIn.getValue(BlockStateProperties.LIT)) { double d0 = (double)pos.getX() + 0.5D; double d1 = (double)pos.getY(); double d2 = (double)pos.getZ() + 0.5D; if (rand.nextDouble() < 0.1D) { - worldIn.playLocalSound(d0, d1, d2, SoundEvents.SMOKER_SMOKE, SoundCategory.BLOCKS, 1.0F, 1.0F, false); + worldIn.playLocalSound(d0, d1, d2, SoundEvents.SMOKER_SMOKE, SoundSource.BLOCKS, 1.0F, 1.0F, false); } worldIn.addParticle(ParticleTypes.SMOKE, d0, d1 + 1.1D, d2, 0.0D, 0.0D, 0.0D); diff --git a/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java b/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java index ec49bcd6..28791b1e 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java +++ b/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java @@ -8,7 +8,7 @@ import mod.alexndr.netherrocks.client.gui.NetherFurnaceScreen; import mod.alexndr.netherrocks.client.gui.NetherSmokerScreen; import mod.alexndr.netherrocks.init.ModContainers; -import net.minecraft.client.gui.ScreenManager; +import net.minecraft.client.gui.screens.MenuScreens; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; @@ -38,9 +38,9 @@ public static void onFMLClientSetupEvent(final FMLClientSetupEvent event) // Register ContainerType Screens // ScreenManager.registerFactory is not safe to call during parallel mod loading so we queue it to run later event.enqueueWork(() -> { - ScreenManager.register(ModContainers.NETHER_FURNACE.get(), NetherFurnaceScreen::new); - ScreenManager.register(ModContainers.NETHER_BLAST_FURNACE.get(), NetherBlastFurnaceScreen::new); - ScreenManager.register(ModContainers.NETHER_SMOKER.get(), NetherSmokerScreen::new); + MenuScreens.register(ModContainers.NETHER_FURNACE.get(), NetherFurnaceScreen::new); + MenuScreens.register(ModContainers.NETHER_BLAST_FURNACE.get(), NetherBlastFurnaceScreen::new); + MenuScreens.register(ModContainers.NETHER_SMOKER.get(), NetherSmokerScreen::new); LOGGER.debug("Registered ContainerType Screens"); }); diff --git a/src/main/java/mod/alexndr/netherrocks/client/gui/NetherBlastFurnaceScreen.java b/src/main/java/mod/alexndr/netherrocks/client/gui/NetherBlastFurnaceScreen.java index 62ae0436..029ad145 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/gui/NetherBlastFurnaceScreen.java +++ b/src/main/java/mod/alexndr/netherrocks/client/gui/NetherBlastFurnaceScreen.java @@ -3,9 +3,9 @@ import mod.alexndr.netherrocks.Netherrocks; import mod.alexndr.netherrocks.content.NetherBlastFurnaceContainer; import mod.alexndr.simplecorelib.client.gui.VeryAbstractFurnaceScreen; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.network.chat.Component; public class NetherBlastFurnaceScreen extends VeryAbstractFurnaceScreen { @@ -13,7 +13,7 @@ public class NetherBlastFurnaceScreen extends VeryAbstractFurnaceScreen { @@ -13,7 +13,7 @@ public class NetherFurnaceScreen extends VeryAbstractFurnaceScreen { @@ -13,7 +13,7 @@ public class NetherSmokerScreen extends VeryAbstractFurnaceScreen tooltip, ITooltipFlag flagIn) + public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List tooltip, TooltipFlag flagIn) { super.appendHoverText(stack, worldIn, tooltip, flagIn); - tooltip.add(new TranslationTextComponent("netherrocks.fyrite_armor.info")); + tooltip.add(new TranslatableComponent("netherrocks.fyrite_armor.info")); } } // end class FyriteArmorItem diff --git a/src/main/java/mod/alexndr/netherrocks/content/FyriteAxeItem.java b/src/main/java/mod/alexndr/netherrocks/content/FyriteAxeItem.java index 1880f2a6..c3aa1e05 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/FyriteAxeItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/FyriteAxeItem.java @@ -1,28 +1,30 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.FyriteHandler; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.AxeItem; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.AxeItem; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.InteractionResult; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.Level; + +import net.minecraft.world.item.Item.Properties; public class FyriteAxeItem extends AxeItem { - public FyriteAxeItem(IItemTier tier, float attackDamageIn, float attackSpeedIn, Properties builder) + public FyriteAxeItem(Tier tier, float attackDamageIn, float attackSpeedIn, Properties builder) { super(tier, attackDamageIn, attackSpeedIn, builder); } @Override - public ActionResultType useOn(ItemUseContext context) + public InteractionResult useOn(UseOnContext context) { - ActionResultType result = super.useOn(context); + InteractionResult result = super.useOn(context); FyriteHandler.INSTANCE.onItemUse(context); return result; } @@ -35,7 +37,7 @@ public boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity atta } @Override - public boolean mineBlock(ItemStack stack, World worldIn, BlockState state, BlockPos pos, + public boolean mineBlock(ItemStack stack, Level worldIn, BlockState state, BlockPos pos, LivingEntity entityLiving) { FyriteHandler.INSTANCE.afterBlockSmelt(worldIn, pos, true); diff --git a/src/main/java/mod/alexndr/netherrocks/content/FyritePickaxeIteam.java b/src/main/java/mod/alexndr/netherrocks/content/FyritePickaxeIteam.java index 6650c068..2be067e1 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/FyritePickaxeIteam.java +++ b/src/main/java/mod/alexndr/netherrocks/content/FyritePickaxeIteam.java @@ -1,26 +1,28 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.FyriteHandler; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.item.PickaxeItem; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.item.PickaxeItem; +import net.minecraft.world.InteractionResult; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.Level; + +import net.minecraft.world.item.Item.Properties; public class FyritePickaxeIteam extends PickaxeItem { - public FyritePickaxeIteam(IItemTier tier, int attackDamageIn, float attackSpeedIn, Properties builder) + public FyritePickaxeIteam(Tier tier, int attackDamageIn, float attackSpeedIn, Properties builder) { super(tier, attackDamageIn, attackSpeedIn, builder); } @Override - public boolean mineBlock(ItemStack stack, World worldIn, BlockState state, BlockPos pos, + public boolean mineBlock(ItemStack stack, Level worldIn, BlockState state, BlockPos pos, LivingEntity entityLiving) { FyriteHandler.INSTANCE.afterBlockSmelt(worldIn, pos, true); @@ -28,9 +30,9 @@ public boolean mineBlock(ItemStack stack, World worldIn, BlockState state, Block } @Override - public ActionResultType useOn(ItemUseContext context) + public InteractionResult useOn(UseOnContext context) { - ActionResultType result = super.useOn(context); + InteractionResult result = super.useOn(context); FyriteHandler.INSTANCE.onItemUse(context); return result; } diff --git a/src/main/java/mod/alexndr/netherrocks/content/FyriteShovelItem.java b/src/main/java/mod/alexndr/netherrocks/content/FyriteShovelItem.java index d650955f..8b7db747 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/FyriteShovelItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/FyriteShovelItem.java @@ -1,20 +1,22 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.FyriteHandler; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.item.ShovelItem; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.item.ShovelItem; +import net.minecraft.world.InteractionResult; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.Level; + +import net.minecraft.world.item.Item.Properties; public class FyriteShovelItem extends ShovelItem { - public FyriteShovelItem(IItemTier tier, float attackDamageIn, float attackSpeedIn, Properties builder) + public FyriteShovelItem(Tier tier, float attackDamageIn, float attackSpeedIn, Properties builder) { super(tier, attackDamageIn, attackSpeedIn, builder); } @@ -22,15 +24,15 @@ public FyriteShovelItem(IItemTier tier, float attackDamageIn, float attackSpeedI // for shovels, do the FyriteHandler() thing AFTER the normal thing, or paths // won't get created. (Paths require air above grass_block, not fire). @Override - public ActionResultType useOn(ItemUseContext context) + public InteractionResult useOn(UseOnContext context) { - ActionResultType result = super.useOn(context); + InteractionResult result = super.useOn(context); FyriteHandler.INSTANCE.onItemUse(context); return result; } @Override - public boolean mineBlock(ItemStack stack, World worldIn, BlockState state, BlockPos pos, + public boolean mineBlock(ItemStack stack, Level worldIn, BlockState state, BlockPos pos, LivingEntity entityLiving) { FyriteHandler.INSTANCE.afterBlockSmelt(worldIn, pos, true); diff --git a/src/main/java/mod/alexndr/netherrocks/content/FyriteSwordItem.java b/src/main/java/mod/alexndr/netherrocks/content/FyriteSwordItem.java index afc6570c..f259016e 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/FyriteSwordItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/FyriteSwordItem.java @@ -1,17 +1,19 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.FyriteHandler; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.item.SwordItem; -import net.minecraft.util.ActionResultType; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.item.SwordItem; +import net.minecraft.world.InteractionResult; + +import net.minecraft.world.item.Item.Properties; public class FyriteSwordItem extends SwordItem { - public FyriteSwordItem(IItemTier tier, int attackDamageIn, float attackSpeedIn, Properties builder) + public FyriteSwordItem(Tier tier, int attackDamageIn, float attackSpeedIn, Properties builder) { super(tier, attackDamageIn, attackSpeedIn, builder); } @@ -24,9 +26,9 @@ public boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity atta } @Override - public ActionResultType useOn(ItemUseContext context) + public InteractionResult useOn(UseOnContext context) { - ActionResultType result = super.useOn(context); + InteractionResult result = super.useOn(context); FyriteHandler.INSTANCE.onItemUse(context); return result; } // end onItemUse() diff --git a/src/main/java/mod/alexndr/netherrocks/content/IllumeniteArmorItem.java b/src/main/java/mod/alexndr/netherrocks/content/IllumeniteArmorItem.java index 4675e109..ef40d205 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/IllumeniteArmorItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/IllumeniteArmorItem.java @@ -4,29 +4,31 @@ import javax.annotation.Nullable; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.IArmorMaterial; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.ArmorMaterial; +import net.minecraft.world.item.ItemStack; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.world.item.Item.Properties; + public class IllumeniteArmorItem extends ArmorItem { - public IllumeniteArmorItem(IArmorMaterial materialIn, EquipmentSlotType slot, Properties builder) + public IllumeniteArmorItem(ArmorMaterial materialIn, EquipmentSlot slot, Properties builder) { super(materialIn, slot, builder); } @Override @OnlyIn(Dist.CLIENT) - public void appendHoverText(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) + public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List tooltip, TooltipFlag flagIn) { super.appendHoverText(stack, worldIn, tooltip, flagIn); - tooltip.add(new TranslationTextComponent("netherrocks.illumenite_armor.info")); + tooltip.add(new TranslatableComponent("netherrocks.illumenite_armor.info")); } } // end class IllumeniteArmorItem diff --git a/src/main/java/mod/alexndr/netherrocks/content/IllumeniteSwordItem.java b/src/main/java/mod/alexndr/netherrocks/content/IllumeniteSwordItem.java index fecd4ed0..10dde6bf 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/IllumeniteSwordItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/IllumeniteSwordItem.java @@ -1,15 +1,17 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.IllumeniteHandler; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.SwordItem; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.SwordItem; + +import net.minecraft.world.item.Item.Properties; public class IllumeniteSwordItem extends SwordItem { - public IllumeniteSwordItem(IItemTier tier, int attackDamageIn, float attackSpeedIn, Properties builder) + public IllumeniteSwordItem(Tier tier, int attackDamageIn, float attackSpeedIn, Properties builder) { super(tier, attackDamageIn, attackSpeedIn, builder); } diff --git a/src/main/java/mod/alexndr/netherrocks/content/MalachiteArmorItem.java b/src/main/java/mod/alexndr/netherrocks/content/MalachiteArmorItem.java index d1f16eee..4770b261 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/MalachiteArmorItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/MalachiteArmorItem.java @@ -5,38 +5,40 @@ import javax.annotation.Nullable; import mod.alexndr.simplecorelib.helpers.ArmorUtils; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.IArmorMaterial; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.ArmorMaterial; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.world.item.Item.Properties; + public class MalachiteArmorItem extends ArmorItem { protected final int jumpBoostFactor = 1; - public MalachiteArmorItem(IArmorMaterial materialIn, EquipmentSlotType slot, Properties builder) + public MalachiteArmorItem(ArmorMaterial materialIn, EquipmentSlot slot, Properties builder) { super(materialIn, slot, builder); } @Override - public void onArmorTick(ItemStack stack, World world, PlayerEntity player) + public void onArmorTick(ItemStack stack, Level world, Player player) { // must be wearing full set and not sneaking if (ArmorUtils.isPlayerWearingFullSet(player, NetherrocksArmorMaterial.MALACHITE) && ! player.isShiftKeyDown()) { - player.addEffect(new EffectInstance(Effects.JUMP, 2, jumpBoostFactor, false, false)); + player.addEffect(new MobEffectInstance(MobEffects.JUMP, 2, jumpBoostFactor, false, false)); //new PotionEffect(MobEffects.JUMP_BOOST, 2, jumpBoostFactor)); } super.onArmorTick(stack, world, player); @@ -44,9 +46,9 @@ public void onArmorTick(ItemStack stack, World world, PlayerEntity player) @Override @OnlyIn(Dist.CLIENT) - public void appendHoverText(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) + public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List tooltip, TooltipFlag flagIn) { super.appendHoverText(stack, worldIn, tooltip, flagIn); - tooltip.add(new TranslationTextComponent("netherrocks.malachite_armor.info")); + tooltip.add(new TranslatableComponent("netherrocks.malachite_armor.info")); } } // end class MalachiteArmorItem diff --git a/src/main/java/mod/alexndr/netherrocks/content/MalachiteAxeItem.java b/src/main/java/mod/alexndr/netherrocks/content/MalachiteAxeItem.java index 27931e65..57f33f61 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/MalachiteAxeItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/MalachiteAxeItem.java @@ -1,15 +1,17 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.MalachiteHandler; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.AxeItem; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.AxeItem; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.ItemStack; + +import net.minecraft.world.item.Item.Properties; public class MalachiteAxeItem extends AxeItem { - public MalachiteAxeItem(IItemTier tier, float attackDamageIn, float attackSpeedIn, Properties builder) + public MalachiteAxeItem(Tier tier, float attackDamageIn, float attackSpeedIn, Properties builder) { super(tier, attackDamageIn, attackSpeedIn, builder); } diff --git a/src/main/java/mod/alexndr/netherrocks/content/MalachiteSwordItem.java b/src/main/java/mod/alexndr/netherrocks/content/MalachiteSwordItem.java index b095522c..05269f31 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/MalachiteSwordItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/MalachiteSwordItem.java @@ -1,15 +1,17 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.MalachiteHandler; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.SwordItem; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.SwordItem; + +import net.minecraft.world.item.Item.Properties; public class MalachiteSwordItem extends SwordItem { - public MalachiteSwordItem(IItemTier tier, int attackDamageIn, float attackSpeedIn, Properties builderIn) + public MalachiteSwordItem(Tier tier, int attackDamageIn, float attackSpeedIn, Properties builderIn) { super(tier, attackDamageIn, attackSpeedIn, builderIn); } diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java index 5c4fa9b1..cd5d38ed 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java @@ -2,21 +2,23 @@ import mod.alexndr.netherrocks.api.content.AbstractNetherBlastFurnaceBlock; import mod.alexndr.netherrocks.init.ModTiles; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.InventoryHelper; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.entity.player.Player; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.Containers; import net.minecraft.stats.Stats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.World; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.InteractionHand; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.items.ItemStackHandler; +import net.minecraft.world.level.block.state.BlockBehaviour.Properties; + public class NetherBlastFurnaceBlock extends AbstractNetherBlastFurnaceBlock { @@ -26,23 +28,23 @@ public NetherBlastFurnaceBlock(Properties builder) } @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) + public BlockEntity createTileEntity(BlockState state, BlockGetter world) { return ModTiles.NETHER_BLAST_FURNACE.get().create(); } @SuppressWarnings("deprecation") @Override - public void onRemove(BlockState oldState, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) + public void onRemove(BlockState oldState, Level worldIn, BlockPos pos, BlockState newState, boolean isMoving) { if (oldState.getBlock() != newState.getBlock()) { - TileEntity tileEntity = worldIn.getBlockEntity(pos); + BlockEntity tileEntity = worldIn.getBlockEntity(pos); if (tileEntity instanceof NetherBlastFurnaceTileEntity) { final ItemStackHandler inventory = ((NetherBlastFurnaceTileEntity) tileEntity).inventory; for (int slot = 0; slot < inventory.getSlots(); ++slot) - InventoryHelper.dropItemStack(worldIn, pos.getX(), pos.getY(), pos.getZ(), + Containers.dropItemStack(worldIn, pos.getX(), pos.getY(), pos.getZ(), inventory.getStackInSlot(slot)); } } @@ -51,18 +53,18 @@ public void onRemove(BlockState oldState, World worldIn, BlockPos pos, BlockStat } // end onRemove @Override - public ActionResultType use(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, - Hand handIn, BlockRayTraceResult hit) + public InteractionResult use(BlockState state, Level worldIn, BlockPos pos, Player player, + InteractionHand handIn, BlockHitResult hit) { if (!worldIn.isClientSide) { - final TileEntity tileEntity = worldIn.getBlockEntity(pos); + final BlockEntity tileEntity = worldIn.getBlockEntity(pos); if (tileEntity instanceof NetherBlastFurnaceTileEntity) { - NetworkHooks.openGui((ServerPlayerEntity) player, (NetherBlastFurnaceTileEntity) tileEntity, pos); + NetworkHooks.openGui((ServerPlayer) player, (NetherBlastFurnaceTileEntity) tileEntity, pos); player.awardStat(Stats.INTERACT_WITH_BLAST_FURNACE); } } - return ActionResultType.SUCCESS; + return InteractionResult.SUCCESS; } } // end class diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceContainer.java b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceContainer.java index 1b7f84ff..7a4392fc 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceContainer.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceContainer.java @@ -5,10 +5,10 @@ import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceContainer; import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModContainers; -import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.world.entity.player.Inventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.fml.network.IContainerFactory; public class NetherBlastFurnaceContainer extends AbstractNetherFurnaceContainer @@ -17,23 +17,23 @@ public class NetherBlastFurnaceContainer extends AbstractNetherFurnaceContainer< * Logical-client-side constructor, called from {@link ContainerType#create(IContainerFactory)} * Calls the logical-server-side constructor with the TileEntity at the pos in the PacketBuffer */ - public NetherBlastFurnaceContainer(final int windowId, final PlayerInventory playerInventory, final PacketBuffer data) + public NetherBlastFurnaceContainer(final int windowId, final Inventory playerInventory, final FriendlyByteBuf data) { this(windowId, playerInventory, getTileEntity(playerInventory, data)); } - public NetherBlastFurnaceContainer(int id, PlayerInventory playerInventory, + public NetherBlastFurnaceContainer(int id, Inventory playerInventory, NetherBlastFurnaceTileEntity tileEntity) { super(ModContainers.NETHER_BLAST_FURNACE.get(), id, playerInventory, tileEntity, ModBlocks.nether_blast_furnace); } - private static NetherBlastFurnaceTileEntity getTileEntity(final PlayerInventory playerInventory, final PacketBuffer data) + private static NetherBlastFurnaceTileEntity getTileEntity(final Inventory playerInventory, final FriendlyByteBuf data) { Objects.requireNonNull(playerInventory, "playerInventory cannot be null!"); Objects.requireNonNull(data, "data cannot be null!"); - final TileEntity tileAtPos = playerInventory.player.level.getBlockEntity(data.readBlockPos()); + final BlockEntity tileAtPos = playerInventory.player.level.getBlockEntity(data.readBlockPos()); if (tileAtPos instanceof NetherBlastFurnaceTileEntity) return (NetherBlastFurnaceTileEntity) tileAtPos; throw new IllegalStateException("Tile entity is not correct! " + tileAtPos); diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java index ba912242..6dc11a29 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java @@ -3,20 +3,20 @@ import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceTileEntity; import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModTiles; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; public class NetherBlastFurnaceTileEntity extends AbstractNetherFurnaceTileEntity { public NetherBlastFurnaceTileEntity() { - super(ModTiles.NETHER_BLAST_FURNACE.get(), IRecipeType.BLASTING); + super(ModTiles.NETHER_BLAST_FURNACE.get(), RecipeType.BLASTING); } @Override @@ -26,13 +26,13 @@ protected int getBurnDuration(ItemStack fuelstack) } @Override - public ITextComponent getDisplayName() + public Component getDisplayName() { - return new TranslationTextComponent(ModBlocks.nether_blast_furnace.get().getDescriptionId()); + return new TranslatableComponent(ModBlocks.nether_blast_furnace.get().getDescriptionId()); } @Override - public Container createMenu(int windowId, PlayerInventory inventory, PlayerEntity player) + public AbstractContainerMenu createMenu(int windowId, Inventory inventory, Player player) { return new NetherBlastFurnaceContainer(windowId, inventory, this); } diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java index 295462fe..d0fd54f3 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java @@ -4,21 +4,23 @@ import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceBlock; import mod.alexndr.netherrocks.init.ModTiles; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.InventoryHelper; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.entity.player.Player; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.Containers; import net.minecraft.stats.Stats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.World; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.InteractionHand; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.items.ItemStackHandler; +import net.minecraft.world.level.block.state.BlockBehaviour.Properties; + public class NetherFurnaceBlock extends AbstractNetherFurnaceBlock { @@ -30,7 +32,7 @@ public NetherFurnaceBlock(final Properties builder) @Nullable @Override - public TileEntity createTileEntity(final BlockState state, final IBlockReader world) { + public BlockEntity createTileEntity(final BlockState state, final BlockGetter world) { // Always use TileEntityType#create to allow registry overrides to work. return ModTiles.NETHER_FURNACE.get().create(); } @@ -43,16 +45,16 @@ public TileEntity createTileEntity(final BlockState state, final IBlockReader wo * Implementing/overriding is fine. */ @Override - public void onRemove(BlockState oldState, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) + public void onRemove(BlockState oldState, Level worldIn, BlockPos pos, BlockState newState, boolean isMoving) { if (oldState.getBlock() != newState.getBlock()) { - TileEntity tileEntity = worldIn.getBlockEntity(pos); + BlockEntity tileEntity = worldIn.getBlockEntity(pos); if (tileEntity instanceof NetherFurnaceTileEntity) { final ItemStackHandler inventory = ((NetherFurnaceTileEntity) tileEntity).inventory; for (int slot = 0; slot < inventory.getSlots(); ++slot) - InventoryHelper.dropItemStack(worldIn, pos.getX(), pos.getY(), pos.getZ(), + Containers.dropItemStack(worldIn, pos.getX(), pos.getY(), pos.getZ(), inventory.getStackInSlot(slot)); } } @@ -68,17 +70,17 @@ public void onRemove(BlockState oldState, World worldIn, BlockPos pos, BlockStat * Implementing/overriding is fine. */ @Override - public ActionResultType use(final BlockState state, final World worldIn, final BlockPos pos, final PlayerEntity player, final Hand handIn, final BlockRayTraceResult hit) + public InteractionResult use(final BlockState state, final Level worldIn, final BlockPos pos, final Player player, final InteractionHand handIn, final BlockHitResult hit) { if (!worldIn.isClientSide) { - final TileEntity tileEntity = worldIn.getBlockEntity(pos); + final BlockEntity tileEntity = worldIn.getBlockEntity(pos); if (tileEntity instanceof NetherFurnaceTileEntity) { - NetworkHooks.openGui((ServerPlayerEntity) player, (NetherFurnaceTileEntity) tileEntity, pos); + NetworkHooks.openGui((ServerPlayer) player, (NetherFurnaceTileEntity) tileEntity, pos); player.awardStat(Stats.INTERACT_WITH_FURNACE); } } - return ActionResultType.SUCCESS; + return InteractionResult.SUCCESS; } diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceContainer.java b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceContainer.java index c665a41a..7d5f22eb 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceContainer.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceContainer.java @@ -5,10 +5,10 @@ import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceContainer; import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModContainers; -import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.world.entity.player.Inventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.fml.network.IContainerFactory; @@ -18,7 +18,7 @@ public class NetherFurnaceContainer extends AbstractNetherFurnaceContainer @@ -17,22 +17,22 @@ public class NetherSmokerContainer extends AbstractNetherFurnaceContainer repairMaterial; + private final LazyLoadedValue repairMaterial; private final float knockbackResistance; private NetherrocksArmorMaterial(String nameIn, int maxDamageIn, int[] drAmtArray, @@ -49,16 +49,16 @@ private NetherrocksArmorMaterial(String nameIn, int maxDamageIn, int[] drAmtArra soundEvent = soundIn; toughness = toughnessIn; knockbackResistance = knockResistanceIn; - repairMaterial = new LazyValue<>(repairMatIn); + repairMaterial = new LazyLoadedValue<>(repairMatIn); } // end ctor() @Override - public int getDurabilityForSlot(EquipmentSlotType slotIn) { + public int getDurabilityForSlot(EquipmentSlot slotIn) { return MAX_DAMAGE_ARRAY[slotIn.getIndex()] * this.maxDamageFactor; } @Override - public int getDefenseForSlot(EquipmentSlotType slotIn) { + public int getDefenseForSlot(EquipmentSlot slotIn) { return this.damageReductionAmountArray[slotIn.getIndex()]; } diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTier.java b/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTier.java index de20ab47..3ece3129 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTier.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTier.java @@ -1,13 +1,13 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.init.ModItems; -import net.minecraft.item.IItemTier; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.LazyValue; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.util.LazyLoadedValue; import java.util.function.Supplier; -public enum NetherrocksItemTier implements IItemTier +public enum NetherrocksItemTier implements Tier { ARGONITE(4, 1300, 8.0F, 3.0F, 18, ()->{ return Ingredient.of(ModItems.argonite_ingot.get());}), @@ -27,7 +27,7 @@ public enum NetherrocksItemTier implements IItemTier private final float efficiency; private final float attackDamage; private final int enchantability; - private final LazyValue repairMaterial; + private final LazyLoadedValue repairMaterial; private NetherrocksItemTier(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, Supplier repairMaterialIn) @@ -37,7 +37,7 @@ private NetherrocksItemTier(int harvestLevelIn, int maxUsesIn, float efficiencyI this.efficiency = efficiencyIn; this.attackDamage = attackDamageIn; this.enchantability = enchantabilityIn; - this.repairMaterial = new LazyValue<>(repairMaterialIn); + this.repairMaterial = new LazyLoadedValue<>(repairMaterialIn); } @Override diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java b/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java index ddf821d4..3d335643 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java @@ -1,7 +1,7 @@ package mod.alexndr.netherrocks.datagen; import mod.alexndr.netherrocks.Netherrocks; -import net.minecraft.data.BlockTagsProvider; +import net.minecraft.data.tags.BlockTagsProvider; import net.minecraft.data.DataGenerator; import net.minecraftforge.common.data.ExistingFileHelper; diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java b/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java index 03b07bfe..c22f95ad 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java @@ -4,7 +4,7 @@ import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.simplecorelib.helpers.TagUtils; import net.minecraft.data.DataGenerator; -import net.minecraft.data.ItemTagsProvider; +import net.minecraft.data.tags.ItemTagsProvider; import net.minecraftforge.common.data.ExistingFileHelper; public class ModItemTags extends ItemTagsProvider diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootInjectorProvider.java b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootInjectorProvider.java index 75b7549a..496c01fc 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootInjectorProvider.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootInjectorProvider.java @@ -11,13 +11,13 @@ import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.simplecorelib.datagen.LootTableInjectorProvider; import net.minecraft.data.DataGenerator; -import net.minecraft.loot.ItemLootEntry; -import net.minecraft.loot.LootParameterSet; -import net.minecraft.loot.LootPool; -import net.minecraft.loot.LootTable.Builder; -import net.minecraft.loot.RandomValueRange; -import net.minecraft.loot.functions.SetCount; -import net.minecraft.util.ResourceLocation; +import net.minecraft.world.level.storage.loot.entries.LootItem; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet; +import net.minecraft.world.level.storage.loot.LootPool; +import net.minecraft.world.level.storage.loot.LootTable.Builder; +import net.minecraft.world.level.storage.loot.RandomValueBounds; +import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction; +import net.minecraft.resources.ResourceLocation; public class NetherrocksLootInjectorProvider extends LootTableInjectorProvider { @@ -28,112 +28,112 @@ public NetherrocksLootInjectorProvider(DataGenerator dataGeneratorIn) } @Override - protected List>>, LootParameterSet>> getTables() + protected List>>, LootContextParamSet>> getTables() { tables.clear(); // desert pyramid LootPool.Builder foo = createChestPool(1, 1, 0.25F) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(10) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(5) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 1)))); + .add(LootItem.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(10) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(5) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 1)))); addInjectionTable(Netherrocks.MODID, "desert_pyramid", foo); // ruined_portal foo = createChestPool(1, 1, 0.50F) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) - .apply(SetCount.setCount(RandomValueRange.between(2, 4)))) - .add(ItemLootEntry.lootTableItem(ModItems.argonite_ingot.get()).setWeight(8) - .apply(SetCount.setCount(RandomValueRange.between(1, 3)))) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(10) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(5) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 1)))); + .add(LootItem.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(2, 4)))) + .add(LootItem.lootTableItem(ModItems.argonite_ingot.get()).setWeight(8) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 3)))) + .add(LootItem.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(10) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(5) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 1)))); addInjectionTable(Netherrocks.MODID, "ruined_portal", foo); // bastion foo = createChestPool(1, 2, 0.75F) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_helmet.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_chestplate.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_leggings.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_boots.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_sword.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_axe.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_pickaxe.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_shovel.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.argonite_sword.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.argonite_axe.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.argonite_pickaxe.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.argonite_shovel.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.ashstone_sword.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.ashstone_axe.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.ashstone_pickaxe.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.ashstone_shovel.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_helmet.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_chestplate.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_leggings.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_boots.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_sword.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_pickaxe.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_shovel.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_helmet.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_chestplate.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_leggings.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_boots.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_sword.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_helmet.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_chestplate.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_leggings.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_boots.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_sword.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_axe.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_pickaxe.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_shovel.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_ingot.get()).setWeight(2) - .apply(SetCount.setCount(RandomValueRange.between(2, 4)))) - .add(ItemLootEntry.lootTableItem(ModItems.argonite_ingot.get()).setWeight(2) - .apply(SetCount.setCount(RandomValueRange.between(1, 3)))) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(2) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 1)))); + .add(LootItem.lootTableItem(ModItems.malachite_helmet.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.malachite_chestplate.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.malachite_leggings.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.malachite_boots.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.malachite_sword.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.malachite_axe.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.malachite_pickaxe.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.malachite_shovel.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.argonite_sword.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.argonite_axe.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.argonite_pickaxe.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.argonite_shovel.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.ashstone_sword.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.ashstone_axe.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.ashstone_pickaxe.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.ashstone_shovel.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.fyrite_helmet.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.fyrite_chestplate.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.fyrite_leggings.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.fyrite_boots.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.fyrite_sword.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.fyrite_pickaxe.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.fyrite_shovel.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.illumenite_helmet.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.illumenite_chestplate.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.illumenite_leggings.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.illumenite_boots.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.illumenite_sword.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.dragonstone_helmet.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.dragonstone_chestplate.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.dragonstone_leggings.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.dragonstone_boots.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.dragonstone_sword.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.dragonstone_axe.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.dragonstone_pickaxe.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.dragonstone_shovel.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_ingot.get()).setWeight(2) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(2, 4)))) + .add(LootItem.lootTableItem(ModItems.argonite_ingot.get()).setWeight(2) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 3)))) + .add(LootItem.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(2) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 1)))); addInjectionTable(Netherrocks.MODID, "bastion", foo); // jungle_temple foo = createChestPool(1, 1, 0.25F) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) - .apply(SetCount.setCount(RandomValueRange.between(2, 4)))) - .add(ItemLootEntry.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))); + .add(LootItem.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(2, 4)))) + .add(LootItem.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))); addInjectionTable(Netherrocks.MODID, "jungle_temple", foo); // stronghold foo = createChestPool(1, 1, 0.25F) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_helmet.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_chestplate.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_leggings.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_boots.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_sword.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_axe.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_pickaxe.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) - .apply(SetCount.setCount(RandomValueRange.between(2, 4)))) - .add(ItemLootEntry.lootTableItem(ModItems.argonite_ingot.get()).setWeight(3) - .apply(SetCount.setCount(RandomValueRange.between(1, 3)))) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(5) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))); + .add(LootItem.lootTableItem(ModItems.malachite_helmet.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_chestplate.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_leggings.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_boots.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_sword.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_axe.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_pickaxe.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(2, 4)))) + .add(LootItem.lootTableItem(ModItems.argonite_ingot.get()).setWeight(3) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 3)))) + .add(LootItem.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(5) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))); addInjectionTable(Netherrocks.MODID, "stronghold", foo); return tables; diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java index aad1be0a..f247c95a 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java @@ -11,9 +11,9 @@ import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.simplecorelib.datagen.BlockLootTableProvider; import net.minecraft.data.DataGenerator; -import net.minecraft.loot.LootParameterSet; -import net.minecraft.loot.LootTable.Builder; -import net.minecraft.util.ResourceLocation; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet; +import net.minecraft.world.level.storage.loot.LootTable.Builder; +import net.minecraft.resources.ResourceLocation; public class NetherrocksLootTableProvider extends BlockLootTableProvider { @@ -25,7 +25,7 @@ public NetherrocksLootTableProvider(DataGenerator dataGeneratorIn) } @Override - protected List>>, LootParameterSet>> getTables() + protected List>>, LootContextParamSet>> getTables() { tables.clear(); standardDropTable(ModBlocks.argonite_block.get()); diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/SilentsRecipes.java b/src/main/java/mod/alexndr/netherrocks/datagen/SilentsRecipes.java index 605b8bfe..117f68ae 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/SilentsRecipes.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/SilentsRecipes.java @@ -8,9 +8,9 @@ import mod.alexndr.simplecorelib.datagen.ISimpleConditionBuilder; import mod.alexndr.simplecorelib.datagen.RecipeSetBuilder; import net.minecraft.data.DataGenerator; -import net.minecraft.data.IFinishedRecipe; -import net.minecraft.data.RecipeProvider; -import net.minecraft.item.crafting.Ingredient; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.world.item.crafting.Ingredient; import net.minecraftforge.common.crafting.conditions.ICondition; import net.minecraftforge.common.crafting.conditions.IConditionBuilder; @@ -25,12 +25,12 @@ public SilentsRecipes(DataGenerator generatorIn) } @Override - protected void buildShapelessRecipes(Consumer consumer) + protected void buildShapelessRecipes(Consumer consumer) { registerFurnaceRecipes(consumer); } // end registerRecipes() - private void registerFurnaceRecipes(Consumer consumer) + private void registerFurnaceRecipes(Consumer consumer) { setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModItems.argonite_dust.get().asItem()), ModItems.argonite_ingot.get(), diff --git a/src/main/java/mod/alexndr/netherrocks/generation/IllumeniteBlobFeature.java b/src/main/java/mod/alexndr/netherrocks/generation/IllumeniteBlobFeature.java index 4a22377c..898aa6ef 100644 --- a/src/main/java/mod/alexndr/netherrocks/generation/IllumeniteBlobFeature.java +++ b/src/main/java/mod/alexndr/netherrocks/generation/IllumeniteBlobFeature.java @@ -5,19 +5,19 @@ import com.mojang.serialization.Codec; import mod.alexndr.netherrocks.init.ModBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ISeedReader; -import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.core.Direction; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.WorldGenLevel; +import net.minecraft.world.level.chunk.ChunkGenerator; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -public class IllumeniteBlobFeature extends Feature +public class IllumeniteBlobFeature extends Feature { - public IllumeniteBlobFeature(Codec p_i231956_1_) + public IllumeniteBlobFeature(Codec p_i231956_1_) { super(p_i231956_1_); } @@ -33,8 +33,8 @@ public IllumeniteBlobFeature(Codec p_i231956_1_) * @return */ @Override - public boolean place(ISeedReader worldIn, - ChunkGenerator generator, Random rand, BlockPos pos, NoFeatureConfig config) + public boolean place(WorldGenLevel worldIn, + ChunkGenerator generator, Random rand, BlockPos pos, NoneFeatureConfiguration config) { if (!worldIn.isEmptyBlock(pos)) { return false; diff --git a/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java b/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java index 54540e2f..76f9629d 100644 --- a/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java +++ b/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java @@ -4,13 +4,13 @@ import mod.alexndr.netherrocks.config.NetherrocksConfig; import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.simplecorelib.world.OreGenUtils; -import net.minecraft.world.gen.GenerationStage.Decoration; -import net.minecraft.world.gen.feature.ConfiguredFeature; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.FeatureSpreadConfig; -import net.minecraft.world.gen.feature.IFeatureConfig; -import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.placement.Placement; +import net.minecraft.world.level.levelgen.GenerationStep.Decoration; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.configurations.CountConfiguration; +import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; +import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import net.minecraft.world.level.levelgen.placement.FeatureDecorator; import net.minecraftforge.event.world.BiomeLoadingEvent; import net.minecraftforge.fml.RegistryObject; import net.minecraftforge.registries.DeferredRegister; @@ -32,9 +32,9 @@ public class OreGeneration public static final DeferredRegister> FEATURES = DeferredRegister.create(ForgeRegistries.FEATURES, Netherrocks.MODID); - public static final RegistryObject> ILLUMENITE_FEATURE = + public static final RegistryObject> ILLUMENITE_FEATURE = FEATURES.register("illumenite_blob", - () -> new IllumeniteBlobFeature(NoFeatureConfig.CODEC)); + () -> new IllumeniteBlobFeature(NoneFeatureConfiguration.CODEC)); /** * generate nether ores. @@ -94,11 +94,11 @@ public static void initNetherFeatures() // to mimic glowstone generation. A side-effect is that more glowstone generates as well. if (NetherrocksConfig.enableIllumeniteOre) { - ORE_ILLUMENITE = ILLUMENITE_FEATURE.get().configured(IFeatureConfig.NONE) + ORE_ILLUMENITE = ILLUMENITE_FEATURE.get().configured(FeatureConfiguration.NONE) .range(NetherrocksConfig.illumenite_cfg.getCfg().maximum).squared() .count(NetherrocksConfig.illumenite_cfg.getVein_count()); - ORE_ILLUMENITE_EXTRA = ILLUMENITE_FEATURE.get().configured(IFeatureConfig.NONE) - .decorated(Placement.GLOWSTONE.configured(new FeatureSpreadConfig(10))); + ORE_ILLUMENITE_EXTRA = ILLUMENITE_FEATURE.get().configured(FeatureConfiguration.NONE) + .decorated(FeatureDecorator.GLOWSTONE.configured(new CountConfiguration(10))); OreGenUtils.registerFeature(Netherrocks.MODID, "illumenite_cluster", ORE_ILLUMENITE); OreGenUtils.registerFeature(Netherrocks.MODID, "illumenite_cluster_extra", ORE_ILLUMENITE_EXTRA); diff --git a/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java b/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java index 76550a01..37396841 100644 --- a/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java +++ b/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java @@ -4,16 +4,16 @@ import mod.alexndr.netherrocks.Netherrocks; import mod.alexndr.simplecorelib.helpers.IWeaponEffectHelper; -import net.minecraft.block.Blocks; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.world.InteractionResult; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.Level; import net.minecraftforge.common.extensions.IForgeBlockState; public class FyriteHandler implements IWeaponEffectHelper @@ -39,7 +39,7 @@ public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity atta * @param pos * @param was_effective */ - public void afterBlockSmelt(World world, BlockPos pos, boolean was_effective) + public void afterBlockSmelt(Level world, BlockPos pos, boolean was_effective) { Netherrocks.LOGGER.info("tried to after-smelt"); if (was_effective && world.isClientSide()) @@ -55,16 +55,16 @@ public void afterBlockSmelt(World world, BlockPos pos, boolean was_effective) } // end-if } - public ActionResultType onItemUse(ItemUseContext context) + public InteractionResult onItemUse(UseOnContext context) { BlockPos adjacentPos = context.getClickedPos(); BlockPos pos = context.getClickedPos(); ItemStack stack = context.getItemInHand(); - PlayerEntity playerIn = context.getPlayer(); - World worldIn = context.getLevel(); + Player playerIn = context.getPlayer(); + Level worldIn = context.getLevel(); if (stack.isEmpty()) { - return ActionResultType.PASS; + return InteractionResult.PASS; } switch (context.getClickedFace()) { @@ -89,7 +89,7 @@ public ActionResultType onItemUse(ItemUseContext context) } // end switch if (!playerIn.mayUseItemAt(adjacentPos, context.getClickedFace(), stack)) { - return ActionResultType.PASS; + return InteractionResult.PASS; } IForgeBlockState targetBlock = worldIn.getBlockState(adjacentPos); if (targetBlock.getBlockState().getBlock().isAir(targetBlock.getBlockState(), worldIn, adjacentPos)) @@ -100,7 +100,7 @@ public ActionResultType onItemUse(ItemUseContext context) worldIn.setBlockAndUpdate(adjacentPos, Blocks.FIRE.defaultBlockState()); stack.hurt(1, worldIn.random, null); } - return ActionResultType.PASS; + return InteractionResult.PASS; } // end onItemUse() } // end class FyriteHandler diff --git a/src/main/java/mod/alexndr/netherrocks/helpers/IllumeniteHandler.java b/src/main/java/mod/alexndr/netherrocks/helpers/IllumeniteHandler.java index 6e8136c6..6cebd380 100644 --- a/src/main/java/mod/alexndr/netherrocks/helpers/IllumeniteHandler.java +++ b/src/main/java/mod/alexndr/netherrocks/helpers/IllumeniteHandler.java @@ -2,10 +2,10 @@ import mod.alexndr.netherrocks.config.NetherrocksConfig; import mod.alexndr.simplecorelib.helpers.IWeaponEffectHelper; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; public class IllumeniteHandler implements IWeaponEffectHelper { @@ -24,9 +24,9 @@ private IllumeniteHandler() {} @Override public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { - attacker.addEffect(new EffectInstance(Effects.NIGHT_VISION, NetherrocksConfig.illumeniteNVTime)); - target.addEffect(new EffectInstance(Effects.BLINDNESS, NetherrocksConfig.illumeniteBlindnessTime)); - target.addEffect(new EffectInstance(Effects.MOVEMENT_SLOWDOWN, + attacker.addEffect(new MobEffectInstance(MobEffects.NIGHT_VISION, NetherrocksConfig.illumeniteNVTime)); + target.addEffect(new MobEffectInstance(MobEffects.BLINDNESS, NetherrocksConfig.illumeniteBlindnessTime)); + target.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, NetherrocksConfig.illumeniteSlowTime, NetherrocksConfig.illumeniteSlowLevel)); return true; diff --git a/src/main/java/mod/alexndr/netherrocks/helpers/MalachiteHandler.java b/src/main/java/mod/alexndr/netherrocks/helpers/MalachiteHandler.java index 2b85552b..f9b13e53 100644 --- a/src/main/java/mod/alexndr/netherrocks/helpers/MalachiteHandler.java +++ b/src/main/java/mod/alexndr/netherrocks/helpers/MalachiteHandler.java @@ -2,10 +2,10 @@ import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.simplecorelib.helpers.IWeaponEffectHelper; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; public class MalachiteHandler implements IWeaponEffectHelper { @@ -19,7 +19,7 @@ public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity atta if (stack.getItem() == ModItems.malachite_axe.get() || stack.getItem() == ModItems.malachite_sword.get()) { - target.addEffect(new EffectInstance(Effects.POISON, 50)); + target.addEffect(new MobEffectInstance(MobEffects.POISON, 50)); } return false; } diff --git a/src/main/java/mod/alexndr/netherrocks/helpers/NetherrocksLootModifiers.java b/src/main/java/mod/alexndr/netherrocks/helpers/NetherrocksLootModifiers.java index 1fd4da77..132eefd7 100644 --- a/src/main/java/mod/alexndr/netherrocks/helpers/NetherrocksLootModifiers.java +++ b/src/main/java/mod/alexndr/netherrocks/helpers/NetherrocksLootModifiers.java @@ -7,13 +7,13 @@ import com.google.gson.JsonObject; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipe; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.loot.LootContext; -import net.minecraft.loot.conditions.ILootCondition; -import net.minecraft.util.ResourceLocation; +import net.minecraft.world.SimpleContainer; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.SmeltingRecipe; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.common.loot.GlobalLootModifierSerializer; import net.minecraftforge.common.loot.LootModifier; import net.minecraftforge.items.ItemHandlerHelper; @@ -24,7 +24,7 @@ public class NetherrocksLootModifiers public static class AutoSmeltLootModifier extends LootModifier { - protected AutoSmeltLootModifier(ILootCondition[] conditionsIn) + protected AutoSmeltLootModifier(LootItemCondition[] conditionsIn) { super(conditionsIn); } @@ -41,8 +41,8 @@ protected List doApply(List generatedLoot, LootContext con protected static ItemStack smelt(ItemStack stack, LootContext context) { return context.getLevel().getRecipeManager() - .getRecipeFor(IRecipeType.SMELTING, new Inventory(stack),context.getLevel()) - .map(FurnaceRecipe::getResultItem) + .getRecipeFor(RecipeType.SMELTING, new SimpleContainer(stack),context.getLevel()) + .map(SmeltingRecipe::getResultItem) .filter(itemStack -> !itemStack.isEmpty()) .map(itemStack -> ItemHandlerHelper.copyStackWithSize(itemStack, stack.getCount() * itemStack.getCount())) .orElse(stack); @@ -53,7 +53,7 @@ public static class Serializer extends GlobalLootModifierSerializer> CONTAINER_TYPES = + public static final DeferredRegister> CONTAINER_TYPES = DeferredRegister.create(ForgeRegistries.CONTAINERS, Netherrocks.MODID); - public static RegistryObject> NETHER_FURNACE = + public static RegistryObject> NETHER_FURNACE = CONTAINER_TYPES.register("nether_furnace", () -> IForgeContainerType.create(NetherFurnaceContainer::new)); - public static RegistryObject> NETHER_SMOKER = + public static RegistryObject> NETHER_SMOKER = CONTAINER_TYPES.register("nether_smoker", () -> IForgeContainerType.create(NetherSmokerContainer::new)); - public static RegistryObject> NETHER_BLAST_FURNACE = + public static RegistryObject> NETHER_BLAST_FURNACE = CONTAINER_TYPES.register("nether_blast_furnace", () -> IForgeContainerType.create(NetherBlastFurnaceContainer::new)); diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModItems.java b/src/main/java/mod/alexndr/netherrocks/init/ModItems.java index 4109b46f..d6fd6658 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModItems.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModItems.java @@ -13,14 +13,14 @@ import mod.alexndr.netherrocks.content.MalachiteSwordItem; import mod.alexndr.netherrocks.content.NetherrocksArmorMaterial; import mod.alexndr.netherrocks.content.NetherrocksItemTier; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.AxeItem; -import net.minecraft.item.HoeItem; -import net.minecraft.item.Item; -import net.minecraft.item.PickaxeItem; -import net.minecraft.item.ShovelItem; -import net.minecraft.item.SwordItem; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.AxeItem; +import net.minecraft.world.item.HoeItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.PickaxeItem; +import net.minecraft.world.item.ShovelItem; +import net.minecraft.world.item.SwordItem; import net.minecraftforge.fml.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -173,58 +173,58 @@ public final class ModItems // ARMOR // dragonstone public static final RegistryObject dragonstone_helmet = ITEMS.register("dragonstone_helmet", - () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlotType.HEAD, + () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlot.HEAD, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_leggings = ITEMS.register("dragonstone_leggings", - () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlotType.LEGS, + () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlot.LEGS, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_chestplate = ITEMS.register("dragonstone_chestplate", - () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlotType.CHEST, + () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlot.CHEST, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_boots = ITEMS.register("dragonstone_boots", - () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlotType.FEET, + () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlot.FEET, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // fyrite public static final RegistryObject fyrite_helmet = ITEMS.register("fyrite_helmet", - () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlotType.HEAD, + () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlot.HEAD, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_leggings = ITEMS.register("fyrite_leggings", - () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlotType.LEGS, + () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlot.LEGS, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_chestplate = ITEMS.register("fyrite_chestplate", - () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlotType.CHEST, + () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlot.CHEST, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_boots = ITEMS.register("fyrite_boots", - () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlotType.FEET, + () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlot.FEET, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // illumenite public static final RegistryObject illumenite_helmet = ITEMS.register("illumenite_helmet", - () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlotType.HEAD, + () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlot.HEAD, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject illumenite_leggings = ITEMS.register("illumenite_leggings", - () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlotType.LEGS, + () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlot.LEGS, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject illumenite_chestplate = ITEMS.register("illumenite_chestplate", - () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlotType.CHEST, + () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlot.CHEST, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject illumenite_boots = ITEMS.register("illumenite_boots", - () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlotType.FEET, + () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlot.FEET, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // malachite public static final RegistryObject malachite_helmet = ITEMS.register("malachite_helmet", - () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlotType.HEAD, + () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlot.HEAD, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_leggings = ITEMS.register("malachite_leggings", - () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlotType.LEGS, + () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlot.LEGS, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_chestplate = ITEMS.register("malachite_chestplate", - () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlotType.CHEST, + () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlot.CHEST, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_boots = ITEMS.register("malachite_boots", - () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlotType.FEET, + () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlot.FEET, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); } // end class ModItems diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModTabGroups.java b/src/main/java/mod/alexndr/netherrocks/init/ModTabGroups.java index f237857a..197497ff 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModTabGroups.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModTabGroups.java @@ -1,8 +1,8 @@ package mod.alexndr.netherrocks.init; import mod.alexndr.netherrocks.Netherrocks; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; import javax.annotation.Nonnull; import java.util.function.Supplier; @@ -10,10 +10,10 @@ public final class ModTabGroups { - public static final ItemGroup MOD_ITEM_GROUP = + public static final CreativeModeTab MOD_ITEM_GROUP = new ModTabGroup(Netherrocks.MODID, () -> new ItemStack(ModItems.fyrite_pickaxe.get())); - public static final class ModTabGroup extends ItemGroup + public static final class ModTabGroup extends CreativeModeTab { @Nonnull diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModTags.java b/src/main/java/mod/alexndr/netherrocks/init/ModTags.java index ddf6eec5..be2981bc 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModTags.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModTags.java @@ -1,10 +1,10 @@ package mod.alexndr.netherrocks.init; import mod.alexndr.netherrocks.Netherrocks; -import net.minecraft.item.Item; -import net.minecraft.tags.ITag; +import net.minecraft.world.item.Item; +import net.minecraft.tags.Tag; import net.minecraft.tags.ItemTags; -import net.minecraft.util.ResourceLocation; +import net.minecraft.resources.ResourceLocation; /** * Holds tag collections this mod needs to keep track of. @@ -14,7 +14,7 @@ public class ModTags private static ResourceLocation tagNetherFurnaceFuels = new ResourceLocation(Netherrocks.MODID, "nether_furnace_fuels"); - public static ITag getnetherFurnaceFuels() + public static Tag getnetherFurnaceFuels() { return ItemTags.getAllTags().getTag(tagNetherFurnaceFuels); } diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModTiles.java b/src/main/java/mod/alexndr/netherrocks/init/ModTiles.java index 2d0588b6..98c8fc13 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModTiles.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModTiles.java @@ -4,7 +4,7 @@ import mod.alexndr.netherrocks.content.NetherBlastFurnaceTileEntity; import mod.alexndr.netherrocks.content.NetherFurnaceTileEntity; import mod.alexndr.netherrocks.content.NetherSmokerTileEntity; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraftforge.fml.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -22,23 +22,23 @@ */ public final class ModTiles { - public static final DeferredRegister> TILE_ENTITY_TYPES = + public static final DeferredRegister> TILE_ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.TILE_ENTITIES, Netherrocks.MODID); // tile entity type // We don't have a datafixer for our TileEntities, so we pass null into build. - public static RegistryObject> NETHER_FURNACE = + public static RegistryObject> NETHER_FURNACE = TILE_ENTITY_TYPES.register("nether_furnace", - () -> TileEntityType.Builder.of(NetherFurnaceTileEntity::new, + () -> BlockEntityType.Builder.of(NetherFurnaceTileEntity::new, ModBlocks.nether_furnace.get()).build(null)); - public static RegistryObject> NETHER_SMOKER = + public static RegistryObject> NETHER_SMOKER = TILE_ENTITY_TYPES.register("nether_smoker", - () -> TileEntityType.Builder.of(NetherSmokerTileEntity::new, + () -> BlockEntityType.Builder.of(NetherSmokerTileEntity::new, ModBlocks.nether_smoker.get()).build(null)); - public static RegistryObject> NETHER_BLAST_FURNACE = + public static RegistryObject> NETHER_BLAST_FURNACE = TILE_ENTITY_TYPES.register("nether_blast_furnace", - () -> TileEntityType.Builder.of(NetherBlastFurnaceTileEntity::new, + () -> BlockEntityType.Builder.of(NetherBlastFurnaceTileEntity::new, ModBlocks.nether_blast_furnace.get()).build(null)); } // end class ModTiles From 49d081d15aa0103a8955f80df93f62953e895654 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sun, 15 Aug 2021 08:47:55 -0500 Subject: [PATCH 04/56] updated versions in gradle.properties --- build.gradle | 1 - gradle.properties | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 4d030ba7..6460bdeb 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,6 @@ apply plugin: 'net.minecraftforge.gradle' // Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. apply plugin: 'eclipse' apply plugin: 'maven-publish' -apply from: 'https://raw.githubusercontent.com/SizableShrimp/Forge-Class-Remapper/main/classremapper.gradle' def getVersionAppendage() { if (System.env.BUILD_NUMBER) diff --git a/gradle.properties b/gradle.properties index e6161464..24bcf1bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,14 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -org.gradle.java.home=/usr/lib/jvm/java-1.8.0-openjdk-amd64 +org.gradle.java.home=/usr/lib/jvm/adoptopenjdk-16-hotspot-amd64 # general -version_minecraft = 1.16.5 -#version_snapshot = 20201028-1.16.3 -version_forge = 1.16.5-36.2.2 +version_minecraft = 1.17.1 +version_forge = 1.17.1-37.0.33 # Simple Ores: Netherrocks -version_mod = 2.3.6 -simplecorelib_version = 1.16.5-2.0.8.22 +simplecorelib_version = 1.17.1-3.0.0.4 +simpleores_version = 1.17.1-3.0.0.1 version_mcjei = 1.16.5 jei_version = 7.6.4.90 From 65c34a00e5671b3be43f1138bda79bf6aad3aee7 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sun, 15 Aug 2021 09:02:02 -0500 Subject: [PATCH 05/56] now build.gradle is fixed up --- build.gradle | 7 +++---- gradle.properties | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 6460bdeb..eda0ddc4 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ version = "${version_minecraft}-${version_mod}." + getVersionAppendage() group = 'mod.alexndr.netherrocks' archivesBaseName = 'netherrocks' -java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8. +java.toolchain.languageVersion = JavaLanguageVersion.of(16) println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) @@ -153,10 +153,9 @@ dependencies { minecraft "net.minecraftforge:forge:${version_forge}" implementation fg.deobf("simplecore-api:SimpleCoreLib:${simplecorelib_version}") // compile against the JEI API but do not include it at runtime - compileOnly fg.deobf("mezz.jei:jei-${version_mcjei}:${jei_version}:api") + // compileOnly fg.deobf("mezz.jei:jei-${version_mcjei}:${jei_version}:api") // at runtime, use the full JEI jar - runtimeOnly fg.deobf("mezz.jei:jei-${version_mcjei}:${jei_version}") - + // runtimeOnly fg.deobf("mezz.jei:jei-${version_mcjei}:${jei_version}") } // Example for how to get properties into the manifest for reading by the runtime.. diff --git a/gradle.properties b/gradle.properties index 24bcf1bd..4a6664c6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,7 @@ version_minecraft = 1.17.1 version_forge = 1.17.1-37.0.33 # Simple Ores: Netherrocks +version_mod = 3.0.0 simplecorelib_version = 1.17.1-3.0.0.4 simpleores_version = 1.17.1-3.0.0.1 version_mcjei = 1.16.5 From 35399ec892ffaaecdeee75097f5f32eae449febc Mon Sep 17 00:00:00 2001 From: Sinhika Date: Fri, 20 Aug 2021 16:57:03 -0500 Subject: [PATCH 06/56] created sorted Item Tiers; lots of fixes from porting --- build.gradle | 33 ++++---- gradle.properties | 4 +- .../netherrocks/ModEventSubscriber.java | 7 +- .../AbstractNetherBlastFurnaceBlock.java | 15 ++-- .../content/AbstractNetherFurnaceBlock.java | 14 ---- .../AbstractNetherFurnaceContainer.java | 34 -------- .../AbstractNetherFurnaceTileEntity.java | 14 ++-- .../content/AbstractNetherSmokerBlock.java | 12 +-- .../netherrocks/content/FyriteArmorItem.java | 8 +- .../netherrocks/content/FyriteAxeItem.java | 10 +-- .../content/FyritePickaxeIteam.java | 12 ++- .../netherrocks/content/FyriteShovelItem.java | 12 ++- .../netherrocks/content/FyriteSwordItem.java | 8 +- .../content/IllumeniteArmorItem.java | 8 +- .../content/IllumeniteSwordItem.java | 4 +- .../content/MalachiteArmorItem.java | 14 ++-- .../netherrocks/content/MalachiteAxeItem.java | 4 +- .../content/MalachiteSwordItem.java | 4 +- .../content/NetherBlastFurnaceBlock.java | 67 ++++++++-------- .../content/NetherBlastFurnaceContainer.java | 33 +++----- .../content/NetherBlastFurnaceTileEntity.java | 11 ++- .../content/NetherFurnaceBlock.java | 77 ++++++++----------- .../content/NetherFurnaceContainer.java | 27 ++----- .../content/NetherFurnaceTileEntity.java | 17 ++-- .../content/NetherSmokerBlock.java | 65 ++++++++-------- .../content/NetherSmokerContainer.java | 34 +++----- .../content/NetherSmokerTileEntity.java | 15 ++-- .../content/NetherrocksArmorMaterial.java | 14 ++-- .../content/NetherrocksItemTier.java | 72 ----------------- .../content/NetherrocksItemTiers.java | 62 +++++++++++++++ .../alexndr/netherrocks/init/ModBlocks.java | 4 +- .../netherrocks/init/ModContainers.java | 2 +- .../alexndr/netherrocks/init/ModItems.java | 2 +- .../alexndr/netherrocks/init/ModTiles.java | 4 +- 34 files changed, 297 insertions(+), 426 deletions(-) delete mode 100644 src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceBlock.java delete mode 100644 src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceContainer.java delete mode 100644 src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTier.java create mode 100644 src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTiers.java diff --git a/build.gradle b/build.gradle index eda0ddc4..378e7920 100644 --- a/build.gradle +++ b/build.gradle @@ -31,15 +31,6 @@ println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getPro minecraft { // The mappings can be changed at any time, and must be in the following format. - // Channel: Version: - // snapshot YYYYMMDD Snapshot are built nightly. - // stable # Stables are built at the discretion of the MCP team. - // official MCVersion Official field/method names from Mojang mapping files - // - // You must be aware of the Mojang license when using the 'official' mappings. - // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - // - // Use non-default mappings at your own risk. they may not always work. // Simply re-run your setup task after changing the mappings to update your workspace. // mappings channel: 'snapshot', version: "${version_snapshot}" mappings channel: 'official', version: "${version_minecraft}" @@ -131,21 +122,25 @@ repositories { name = "CurseForge" url = "https://minecraft.curseforge.com/api/maven/" } - maven { - // location of the maven that hosts JEI files - name = "Progwml6 maven" - url = "https://dvs1.progwml6.com/files/maven/" - } - maven { - // location of a maven mirror for JEI files, as a fallback - name = "ModMaven" - url = "https://modmaven.k-4u.nl" - } +// maven { +// // location of the maven that hosts JEI files +// name = "Progwml6 maven" +// url = "https://dvs1.progwml6.com/files/maven/" +// } +// maven { +// // location of a maven mirror for JEI files, as a fallback +// name = "ModMaven" +// url = "https://modmaven.k-4u.nl" +// } } // Include resources generated by data generators. sourceSets.main.resources { srcDir 'src/generated/resources' } +sourceSets.main.java { + exclude 'mod/alexndr/netherrocks/client/jei/**' +} + dependencies { // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. diff --git a/gradle.properties b/gradle.properties index 4a6664c6..0688674c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,11 +6,11 @@ org.gradle.java.home=/usr/lib/jvm/adoptopenjdk-16-hotspot-amd64 # general version_minecraft = 1.17.1 -version_forge = 1.17.1-37.0.33 +version_forge = 1.17.1-37.0.40 # Simple Ores: Netherrocks version_mod = 3.0.0 -simplecorelib_version = 1.17.1-3.0.0.4 +simplecorelib_version = 1.17.1-3.0.0.6 simpleores_version = 1.17.1-3.0.0.1 version_mcjei = 1.16.5 jei_version = 7.6.4.90 diff --git a/src/main/java/mod/alexndr/netherrocks/ModEventSubscriber.java b/src/main/java/mod/alexndr/netherrocks/ModEventSubscriber.java index 2f625a66..d840876a 100644 --- a/src/main/java/mod/alexndr/netherrocks/ModEventSubscriber.java +++ b/src/main/java/mod/alexndr/netherrocks/ModEventSubscriber.java @@ -13,18 +13,19 @@ import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModTabGroups; import mod.alexndr.simplecorelib.config.FlagCondition; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.RecipeSerializer; -import net.minecraft.resources.ResourceLocation; import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.loot.GlobalLootModifierSerializer; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.RegistryObject; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.event.config.ModConfigEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fmllegacy.RegistryObject; import net.minecraftforge.registries.IForgeRegistry; @Mod.EventBusSubscriber(modid = Netherrocks.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) @@ -73,7 +74,7 @@ public static void onRegisterItems(final RegistryEvent.Register event) } // end onRegisterItems() @SubscribeEvent - public static void onModConfigEvent(final ModConfig.ModConfigEvent event) + public static void onModConfigEvent(final ModConfigEvent event) { final ModConfig config = event.getConfig(); diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherBlastFurnaceBlock.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherBlastFurnaceBlock.java index bbdfbae5..3beb0d4b 100644 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherBlastFurnaceBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherBlastFurnaceBlock.java @@ -2,18 +2,17 @@ import java.util.Random; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceBlock; +import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.sounds.SoundSource; +import net.minecraft.core.particles.ParticleTypes; import net.minecraft.sounds.SoundEvents; -import net.minecraft.core.BlockPos; +import net.minecraft.sounds.SoundSource; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.world.level.block.state.BlockBehaviour.Properties; - -public abstract class AbstractNetherBlastFurnaceBlock extends AbstractNetherFurnaceBlock +public abstract class AbstractNetherBlastFurnaceBlock extends VeryAbstractFurnaceBlock { public AbstractNetherBlastFurnaceBlock(Properties builder) diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceBlock.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceBlock.java deleted file mode 100644 index 7f348916..00000000 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceBlock.java +++ /dev/null @@ -1,14 +0,0 @@ -package mod.alexndr.netherrocks.api.content; - -import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceBlock; - -import net.minecraft.world.level.block.state.BlockBehaviour.Properties; - -public abstract class AbstractNetherFurnaceBlock extends VeryAbstractFurnaceBlock -{ - public AbstractNetherFurnaceBlock(Properties builder) - { - super(builder); - } - -} // end class \ No newline at end of file diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceContainer.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceContainer.java deleted file mode 100644 index 020047a3..00000000 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceContainer.java +++ /dev/null @@ -1,34 +0,0 @@ -package mod.alexndr.netherrocks.api.content; - -import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceContainer; -import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceTileEntity; -import net.minecraft.client.network.play.ClientPlayNetHandler; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.container.Container; -import net.minecraft.world.inventory.MenuType; -import net.minecraft.network.play.server.SWindowPropertyPacket; -import net.minecraft.util.IntReferenceHolder; -import net.minecraftforge.fml.RegistryObject; - -/** - * Smelt time is synced with - * Server: Each tick {@link #detectAndSendChanges()} is called ({@link ServerPlayerEntity#tick()}) - * Server: The (tracked) value of the tile's energy is updated ({@link #updateProgressBar(int, int)}) - * Server: If the value is different from the value last sent to the client ({@link IntReferenceHolder#isDirty()}), - * it is synced to the client ({@link ServerPlayerEntity#sendWindowProperty(Container, int, int)}) - * Client: The sync packet is received ({@link ClientPlayNetHandler#handleWindowProperty(SWindowPropertyPacket)}) - * and the tracked value of is updated ({@link Container#updateProgressBar(int, int)}) - * Client: The tile's data is set to the new value - * - * @author Sinhika, notes by Cadiboo - */ -public abstract class AbstractNetherFurnaceContainer extends VeryAbstractFurnaceContainer -{ - - public AbstractNetherFurnaceContainer(MenuType containerType, int id, Inventory playerInventory, - VeryAbstractFurnaceTileEntity tileEntity, RegistryObject arg4) - { - super(containerType, id, playerInventory, tileEntity, arg4); - } -} \ No newline at end of file diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java index 30605949..8f58eef9 100644 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java +++ b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java @@ -13,23 +13,25 @@ import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.netherrocks.init.ModTags; import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceTileEntity; -import net.minecraft.world.level.block.Blocks; +import net.minecraft.core.BlockPos; +import net.minecraft.tags.Tag; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.AbstractCookingRecipe; import net.minecraft.world.item.crafting.RecipeType; -import net.minecraft.tags.Tag; -import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; public abstract class AbstractNetherFurnaceTileEntity extends VeryAbstractFurnaceTileEntity { - public AbstractNetherFurnaceTileEntity(BlockEntityType tileEntityTypeIn, - RecipeType recipeTypeIn) + public AbstractNetherFurnaceTileEntity(BlockEntityType tileEntityTypeIn, BlockPos blockpos, BlockState blockstate, + RecipeType recipeTypeIn) { - super(tileEntityTypeIn, recipeTypeIn); + super(tileEntityTypeIn, blockpos, blockstate, recipeTypeIn); } @Override diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherSmokerBlock.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherSmokerBlock.java index bf3c8f22..74137718 100644 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherSmokerBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherSmokerBlock.java @@ -2,19 +2,19 @@ import java.util.Random; -import net.minecraft.world.level.block.state.BlockState; +import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceBlock; +import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.sounds.SoundSource; import net.minecraft.sounds.SoundEvents; -import net.minecraft.core.BlockPos; +import net.minecraft.sounds.SoundSource; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.world.level.block.state.BlockBehaviour.Properties; -public abstract class AbstractNetherSmokerBlock extends AbstractNetherFurnaceBlock +public abstract class AbstractNetherSmokerBlock extends VeryAbstractFurnaceBlock { public AbstractNetherSmokerBlock(Properties builder) diff --git a/src/main/java/mod/alexndr/netherrocks/content/FyriteArmorItem.java b/src/main/java/mod/alexndr/netherrocks/content/FyriteArmorItem.java index daf6b051..db7e5049 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/FyriteArmorItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/FyriteArmorItem.java @@ -4,19 +4,17 @@ import javax.annotation.Nullable; -import net.minecraft.world.item.TooltipFlag; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.ArmorMaterial; import net.minecraft.world.item.ItemStack; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.world.item.Item.Properties; - public class FyriteArmorItem extends ArmorItem { public FyriteArmorItem(ArmorMaterial materialIn, EquipmentSlot slot, Properties builder) diff --git a/src/main/java/mod/alexndr/netherrocks/content/FyriteAxeItem.java b/src/main/java/mod/alexndr/netherrocks/content/FyriteAxeItem.java index c3aa1e05..19b68fb0 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/FyriteAxeItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/FyriteAxeItem.java @@ -1,17 +1,15 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.FyriteHandler; -import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.core.BlockPos; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.AxeItem; -import net.minecraft.world.item.Tier; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Tier; import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.InteractionResult; -import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; - -import net.minecraft.world.item.Item.Properties; +import net.minecraft.world.level.block.state.BlockState; public class FyriteAxeItem extends AxeItem { diff --git a/src/main/java/mod/alexndr/netherrocks/content/FyritePickaxeIteam.java b/src/main/java/mod/alexndr/netherrocks/content/FyritePickaxeIteam.java index 2be067e1..759e21a3 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/FyritePickaxeIteam.java +++ b/src/main/java/mod/alexndr/netherrocks/content/FyritePickaxeIteam.java @@ -1,17 +1,15 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.FyriteHandler; -import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.core.BlockPos; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.Tier; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.item.PickaxeItem; -import net.minecraft.world.InteractionResult; -import net.minecraft.core.BlockPos; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; - -import net.minecraft.world.item.Item.Properties; +import net.minecraft.world.level.block.state.BlockState; public class FyritePickaxeIteam extends PickaxeItem { diff --git a/src/main/java/mod/alexndr/netherrocks/content/FyriteShovelItem.java b/src/main/java/mod/alexndr/netherrocks/content/FyriteShovelItem.java index 8b7db747..148bace5 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/FyriteShovelItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/FyriteShovelItem.java @@ -1,17 +1,15 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.FyriteHandler; -import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.core.BlockPos; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.Tier; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.item.ShovelItem; -import net.minecraft.world.InteractionResult; -import net.minecraft.core.BlockPos; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; - -import net.minecraft.world.item.Item.Properties; +import net.minecraft.world.level.block.state.BlockState; public class FyriteShovelItem extends ShovelItem { diff --git a/src/main/java/mod/alexndr/netherrocks/content/FyriteSwordItem.java b/src/main/java/mod/alexndr/netherrocks/content/FyriteSwordItem.java index f259016e..13c1dde0 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/FyriteSwordItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/FyriteSwordItem.java @@ -1,14 +1,12 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.FyriteHandler; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.Tier; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.item.SwordItem; -import net.minecraft.world.InteractionResult; - -import net.minecraft.world.item.Item.Properties; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.context.UseOnContext; public class FyriteSwordItem extends SwordItem { diff --git a/src/main/java/mod/alexndr/netherrocks/content/IllumeniteArmorItem.java b/src/main/java/mod/alexndr/netherrocks/content/IllumeniteArmorItem.java index ef40d205..44c83deb 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/IllumeniteArmorItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/IllumeniteArmorItem.java @@ -4,19 +4,17 @@ import javax.annotation.Nullable; -import net.minecraft.world.item.TooltipFlag; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.ArmorMaterial; import net.minecraft.world.item.ItemStack; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.world.item.Item.Properties; - public class IllumeniteArmorItem extends ArmorItem { public IllumeniteArmorItem(ArmorMaterial materialIn, EquipmentSlot slot, Properties builder) diff --git a/src/main/java/mod/alexndr/netherrocks/content/IllumeniteSwordItem.java b/src/main/java/mod/alexndr/netherrocks/content/IllumeniteSwordItem.java index 10dde6bf..1ad4ec16 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/IllumeniteSwordItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/IllumeniteSwordItem.java @@ -2,11 +2,9 @@ import mod.alexndr.netherrocks.helpers.IllumeniteHandler; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.Tier; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.SwordItem; - -import net.minecraft.world.item.Item.Properties; +import net.minecraft.world.item.Tier; public class IllumeniteSwordItem extends SwordItem { diff --git a/src/main/java/mod/alexndr/netherrocks/content/MalachiteArmorItem.java b/src/main/java/mod/alexndr/netherrocks/content/MalachiteArmorItem.java index 4770b261..1835b648 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/MalachiteArmorItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/MalachiteArmorItem.java @@ -5,22 +5,20 @@ import javax.annotation.Nullable; import mod.alexndr.simplecorelib.helpers.ArmorUtils; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.entity.player.Player; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.ArmorMaterial; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.world.item.Item.Properties; - public class MalachiteArmorItem extends ArmorItem { diff --git a/src/main/java/mod/alexndr/netherrocks/content/MalachiteAxeItem.java b/src/main/java/mod/alexndr/netherrocks/content/MalachiteAxeItem.java index 57f33f61..a434efee 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/MalachiteAxeItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/MalachiteAxeItem.java @@ -3,10 +3,8 @@ import mod.alexndr.netherrocks.helpers.MalachiteHandler; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.AxeItem; -import net.minecraft.world.item.Tier; import net.minecraft.world.item.ItemStack; - -import net.minecraft.world.item.Item.Properties; +import net.minecraft.world.item.Tier; public class MalachiteAxeItem extends AxeItem { diff --git a/src/main/java/mod/alexndr/netherrocks/content/MalachiteSwordItem.java b/src/main/java/mod/alexndr/netherrocks/content/MalachiteSwordItem.java index 05269f31..2e437854 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/MalachiteSwordItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/MalachiteSwordItem.java @@ -2,11 +2,9 @@ import mod.alexndr.netherrocks.helpers.MalachiteHandler; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.Tier; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.SwordItem; - -import net.minecraft.world.item.Item.Properties; +import net.minecraft.world.item.Tier; public class MalachiteSwordItem extends SwordItem { diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java index cd5d38ed..1bd6dd76 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java @@ -2,23 +2,19 @@ import mod.alexndr.netherrocks.api.content.AbstractNetherBlastFurnaceBlock; import mod.alexndr.netherrocks.init.ModTiles; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.entity.player.Player; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.Containers; -import net.minecraft.stats.Stats; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.InteractionHand; +import mod.alexndr.simplecorelib.content.TestFurnaceTileEntity; import net.minecraft.core.BlockPos; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.level.BlockGetter; +import net.minecraft.stats.Stats; +import net.minecraft.world.Containers; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; -import net.minecraftforge.fml.network.NetworkHooks; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.items.ItemStackHandler; -import net.minecraft.world.level.block.state.BlockBehaviour.Properties; - public class NetherBlastFurnaceBlock extends AbstractNetherBlastFurnaceBlock { @@ -27,13 +23,7 @@ public NetherBlastFurnaceBlock(Properties builder) super(builder); } - @Override - public BlockEntity createTileEntity(BlockState state, BlockGetter world) - { - return ModTiles.NETHER_BLAST_FURNACE.get().create(); - } - - @SuppressWarnings("deprecation") + @SuppressWarnings("deprecation") @Override public void onRemove(BlockState oldState, Level worldIn, BlockPos pos, BlockState newState, boolean isMoving) { @@ -52,19 +42,28 @@ public void onRemove(BlockState oldState, Level worldIn, BlockPos pos, BlockStat super.onRemove(oldState, worldIn, pos, newState, isMoving); } // end onRemove - @Override - public InteractionResult use(BlockState state, Level worldIn, BlockPos pos, Player player, - InteractionHand handIn, BlockHitResult hit) - { - if (!worldIn.isClientSide) { - final BlockEntity tileEntity = worldIn.getBlockEntity(pos); - if (tileEntity instanceof NetherBlastFurnaceTileEntity) - { - NetworkHooks.openGui((ServerPlayer) player, (NetherBlastFurnaceTileEntity) tileEntity, pos); - player.awardStat(Stats.INTERACT_WITH_BLAST_FURNACE); - } - } - return InteractionResult.SUCCESS; - } + @Override + public BlockEntityTicker getTicker(Level level, BlockState bstate, BlockEntityType entityType) + { + return createFurnaceTicker(level, entityType, ModTiles.NETHER_BLAST_FURNACE.get()); + } + + + @Override + public BlockEntity newBlockEntity(BlockPos bpos, BlockState bstate) { + return new TestFurnaceTileEntity(bpos, bstate); + } + + + @Override + protected void openContainer(Level level, BlockPos bpos, Player player) + { + BlockEntity blockentity = level.getBlockEntity(bpos); + if (blockentity instanceof NetherBlastFurnaceTileEntity) + { + player.openMenu((MenuProvider) blockentity); + player.awardStat(Stats.INTERACT_WITH_FURNACE); + } + } } // end class diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceContainer.java b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceContainer.java index 7a4392fc..ee0d8104 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceContainer.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceContainer.java @@ -1,17 +1,13 @@ package mod.alexndr.netherrocks.content; -import java.util.Objects; - -import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceContainer; -import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModContainers; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.inventory.container.ContainerType; +import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceMenu; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraftforge.fml.network.IContainerFactory; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraftforge.fmllegacy.network.IContainerFactory; -public class NetherBlastFurnaceContainer extends AbstractNetherFurnaceContainer +public class NetherBlastFurnaceContainer extends VeryAbstractFurnaceMenu { /** * Logical-client-side constructor, called from {@link ContainerType#create(IContainerFactory)} @@ -19,24 +15,13 @@ public class NetherBlastFurnaceContainer extends AbstractNetherFurnaceContainer< */ public NetherBlastFurnaceContainer(final int windowId, final Inventory playerInventory, final FriendlyByteBuf data) { - this(windowId, playerInventory, getTileEntity(playerInventory, data)); + super(ModContainers.NETHER_BLAST_FURNACE.get(), RecipeType.BLASTING, windowId, playerInventory); } - public NetherBlastFurnaceContainer(int id, Inventory playerInventory, - NetherBlastFurnaceTileEntity tileEntity) + public NetherBlastFurnaceContainer(final int windowId, final Inventory playerInventory, final NetherBlastFurnaceTileEntity tileEntity) { - super(ModContainers.NETHER_BLAST_FURNACE.get(), id, playerInventory, tileEntity, - ModBlocks.nether_blast_furnace); + super(ModContainers.NETHER_BLAST_FURNACE.get(), RecipeType.BLASTING, windowId, playerInventory, tileEntity.inventory, + tileEntity.dataAccess, tileEntity); } - private static NetherBlastFurnaceTileEntity getTileEntity(final Inventory playerInventory, final FriendlyByteBuf data) - { - Objects.requireNonNull(playerInventory, "playerInventory cannot be null!"); - Objects.requireNonNull(data, "data cannot be null!"); - final BlockEntity tileAtPos = playerInventory.player.level.getBlockEntity(data.readBlockPos()); - if (tileAtPos instanceof NetherBlastFurnaceTileEntity) - return (NetherBlastFurnaceTileEntity) tileAtPos; - throw new IllegalStateException("Tile entity is not correct! " + tileAtPos); - } - } // end class diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java index 6dc11a29..2baaa0f8 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java @@ -8,15 +8,17 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; public class NetherBlastFurnaceTileEntity extends AbstractNetherFurnaceTileEntity { - public NetherBlastFurnaceTileEntity() + public NetherBlastFurnaceTileEntity(BlockPos blockpos, BlockState blockstate) { - super(ModTiles.NETHER_BLAST_FURNACE.get(), RecipeType.BLASTING); + super(ModTiles.NETHER_BLAST_FURNACE.get(), blockpos, blockstate, RecipeType.BLASTING); } @Override @@ -26,15 +28,16 @@ protected int getBurnDuration(ItemStack fuelstack) } @Override - public Component getDisplayName() + public Component getDefaultName() { return new TranslatableComponent(ModBlocks.nether_blast_furnace.get().getDescriptionId()); } @Override - public AbstractContainerMenu createMenu(int windowId, Inventory inventory, Player player) + public AbstractContainerMenu createMenu(int windowId, Inventory inventory) { return new NetherBlastFurnaceContainer(windowId, inventory, this); } + } // end class diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java index d0fd54f3..29e6800f 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java @@ -1,27 +1,21 @@ package mod.alexndr.netherrocks.content; -import javax.annotation.Nullable; - -import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceBlock; import mod.alexndr.netherrocks.init.ModTiles; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.entity.player.Player; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.Containers; -import net.minecraft.stats.Stats; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.InteractionHand; +import mod.alexndr.simplecorelib.content.TestFurnaceTileEntity; +import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceBlock; import net.minecraft.core.BlockPos; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.level.BlockGetter; +import net.minecraft.stats.Stats; +import net.minecraft.world.Containers; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; -import net.minecraftforge.fml.network.NetworkHooks; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.items.ItemStackHandler; -import net.minecraft.world.level.block.state.BlockBehaviour.Properties; - -public class NetherFurnaceBlock extends AbstractNetherFurnaceBlock +public class NetherFurnaceBlock extends VeryAbstractFurnaceBlock { public NetherFurnaceBlock(final Properties builder) @@ -30,13 +24,6 @@ public NetherFurnaceBlock(final Properties builder) } // end ctor - @Nullable - @Override - public BlockEntity createTileEntity(final BlockState state, final BlockGetter world) { - // Always use TileEntityType#create to allow registry overrides to work. - return ModTiles.NETHER_FURNACE.get().create(); - } - /** * Called on the logical server when a BlockState with a TileEntity is replaced by another BlockState. * We use this method to drop all the items from our tile entity's inventory and update comparators near our block. @@ -62,26 +49,28 @@ public void onRemove(BlockState oldState, Level worldIn, BlockPos pos, BlockStat super.onRemove(oldState, worldIn, pos, newState, isMoving); } - /** - * Called when a player right clicks our block. - * We use this method to open our gui. - * - * @deprecated Call via {@link BlockState#onBlockActivated(World, PlayerEntity, Hand, BlockRayTraceResult)} whenever possible. - * Implementing/overriding is fine. - */ - @Override - public InteractionResult use(final BlockState state, final Level worldIn, final BlockPos pos, final Player player, final InteractionHand handIn, final BlockHitResult hit) - { - if (!worldIn.isClientSide) { - final BlockEntity tileEntity = worldIn.getBlockEntity(pos); - if (tileEntity instanceof NetherFurnaceTileEntity) - { - NetworkHooks.openGui((ServerPlayer) player, (NetherFurnaceTileEntity) tileEntity, pos); - player.awardStat(Stats.INTERACT_WITH_FURNACE); - } - } - return InteractionResult.SUCCESS; - } + @Override + public BlockEntityTicker getTicker(Level level, BlockState bstate, BlockEntityType entityType) + { + return createFurnaceTicker(level, entityType, ModTiles.NETHER_FURNACE.get()); + } + + + @Override + public BlockEntity newBlockEntity(BlockPos bpos, BlockState bstate) { + return new TestFurnaceTileEntity(bpos, bstate); + } + + @Override + protected void openContainer(Level level, BlockPos bpos, Player player) + { + BlockEntity blockentity = level.getBlockEntity(bpos); + if (blockentity instanceof NetherFurnaceTileEntity) + { + player.openMenu((MenuProvider) blockentity); + player.awardStat(Stats.INTERACT_WITH_FURNACE); + } + } } // end class NetherFurnaceBlock diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceContainer.java b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceContainer.java index 7d5f22eb..1a07c542 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceContainer.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceContainer.java @@ -1,18 +1,14 @@ package mod.alexndr.netherrocks.content; -import java.util.Objects; - -import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceContainer; -import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModContainers; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.inventory.container.ContainerType; +import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceMenu; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraftforge.fml.network.IContainerFactory; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraftforge.fmllegacy.network.IContainerFactory; -public class NetherFurnaceContainer extends AbstractNetherFurnaceContainer +public class NetherFurnaceContainer extends VeryAbstractFurnaceMenu { /** * Logical-client-side constructor, called from {@link ContainerType#create(IContainerFactory)} @@ -20,7 +16,7 @@ public class NetherFurnaceContainer extends AbstractNetherFurnaceContainer BlockEntityTicker getTicker(Level level, BlockState bstate, BlockEntityType entityType) + { + return createFurnaceTicker(level, entityType, ModTiles.NETHER_SMOKER.get()); + } + + + @Override + public BlockEntity newBlockEntity(BlockPos bpos, BlockState bstate) { + return new TestFurnaceTileEntity(bpos, bstate); + } + + + @Override + protected void openContainer(Level level, BlockPos bpos, Player player) + { + BlockEntity blockentity = level.getBlockEntity(bpos); + if (blockentity instanceof NetherSmokerTileEntity) + { + player.openMenu((MenuProvider) blockentity); + player.awardStat(Stats.INTERACT_WITH_FURNACE); + } + } } // end-class diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerContainer.java b/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerContainer.java index e3f47488..b84d3dc1 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerContainer.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerContainer.java @@ -1,17 +1,13 @@ package mod.alexndr.netherrocks.content; -import java.util.Objects; - -import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceContainer; -import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModContainers; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.inventory.container.ContainerType; +import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceMenu; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraftforge.fml.network.IContainerFactory; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraftforge.fmllegacy.network.IContainerFactory; -public class NetherSmokerContainer extends AbstractNetherFurnaceContainer +public class NetherSmokerContainer extends VeryAbstractFurnaceMenu { /** * Logical-client-side constructor, called from {@link ContainerType#create(IContainerFactory)} @@ -19,23 +15,13 @@ public class NetherSmokerContainer extends AbstractNetherFurnaceContainer repairMaterial; + private final Lazy repairMaterial; private final float knockbackResistance; private NetherrocksArmorMaterial(String nameIn, int maxDamageIn, int[] drAmtArray, @@ -49,7 +49,7 @@ private NetherrocksArmorMaterial(String nameIn, int maxDamageIn, int[] drAmtArra soundEvent = soundIn; toughness = toughnessIn; knockbackResistance = knockResistanceIn; - repairMaterial = new LazyLoadedValue<>(repairMatIn); + repairMaterial = Lazy.of(repairMatIn); } // end ctor() @Override diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTier.java b/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTier.java deleted file mode 100644 index 3ece3129..00000000 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTier.java +++ /dev/null @@ -1,72 +0,0 @@ -package mod.alexndr.netherrocks.content; - -import mod.alexndr.netherrocks.init.ModItems; -import net.minecraft.world.item.Tier; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.util.LazyLoadedValue; - -import java.util.function.Supplier; - -public enum NetherrocksItemTier implements Tier -{ - ARGONITE(4, 1300, 8.0F, 3.0F, 18, - ()->{ return Ingredient.of(ModItems.argonite_ingot.get());}), - ASHSTONE(3, 900, 16.0F, 2.0F, 7, - ()->{ return Ingredient.of(ModItems.ashstone_gem.get());}), - DRAGONSTONE(4, 4000, 10.0F, 8.0F, 27, - ()->{ return Ingredient.of(ModItems.dragonstone_gem.get());}), - FYRITE(3, 150, 8.0F, 4.0F, 7, - ()->{ return Ingredient.of(ModItems.fyrite_ingot.get());}), - ILLUMENITE(3, 700, 8.0F, 4.0F, 15, - ()->{ return Ingredient.of(ModItems.illumenite_ingot.get());}), - MALACHITE(3, 700, 9.0F, 3.0F, 39, - ()->{ return Ingredient.of(ModItems.malachite_ingot.get());}); - - private final int harvestLevel; - private final int maxUses; - private final float efficiency; - private final float attackDamage; - private final int enchantability; - private final LazyLoadedValue repairMaterial; - - private NetherrocksItemTier(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, - Supplier repairMaterialIn) - { - this.harvestLevel = harvestLevelIn; - this.maxUses = maxUsesIn; - this.efficiency = efficiencyIn; - this.attackDamage = attackDamageIn; - this.enchantability = enchantabilityIn; - this.repairMaterial = new LazyLoadedValue<>(repairMaterialIn); - } - - @Override - public int getUses() { - return this.maxUses; - } - - @Override - public float getSpeed() { - return this.efficiency; - } - - @Override - public float getAttackDamageBonus() { - return this.attackDamage; - } - - @Override - public int getLevel() { - return this.harvestLevel; - } - - @Override - public int getEnchantmentValue() { - return this.enchantability; - } - - @Override - public Ingredient getRepairIngredient() { - return this.repairMaterial.get(); - } -} // end class SimpleOresItemTier diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTiers.java b/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTiers.java new file mode 100644 index 00000000..e2c3195a --- /dev/null +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTiers.java @@ -0,0 +1,62 @@ +package mod.alexndr.netherrocks.content; + +import java.util.List; + +import mod.alexndr.netherrocks.Netherrocks; +import mod.alexndr.netherrocks.init.ModItems; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.Tag; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.Tiers; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.ForgeTier; +import net.minecraftforge.common.TierSortingRegistry; + +public final class NetherrocksItemTiers +{ + public static final Tag.Named ARGONITE_TAG = + BlockTags.createOptional(new ResourceLocation(Netherrocks.MODID, "needs_argonite_tool")); + public static final Tag.Named ASHSTONE_TAG = + BlockTags.createOptional(new ResourceLocation(Netherrocks.MODID, "needs_ashstone_tool")); + public static final Tag.Named DRAGONSTONE_TAG = + BlockTags.createOptional(new ResourceLocation(Netherrocks.MODID, "needs_dragonstone_tool")); + public static final Tag.Named FYRITE_TAG = + BlockTags.createOptional(new ResourceLocation(Netherrocks.MODID, "needs_fyrite_tool")); + public static final Tag.Named ILLUMENITE_TAG = + BlockTags.createOptional(new ResourceLocation(Netherrocks.MODID, "needs_illumenite_tool")); + public static final Tag.Named MALACHITE_TAG = + BlockTags.createOptional(new ResourceLocation(Netherrocks.MODID, "needs_malachite_tool")); + + public static final Tier ARGONITE = TierSortingRegistry.registerTier( + new ForgeTier(Tiers.NETHERITE.getLevel(), 1300, 8.0F, 3.0F, 18, ARGONITE_TAG, + ()->Ingredient.of(ModItems.argonite_ingot.get())), new ResourceLocation(Netherrocks.MODID, "argonite"), + List.of(Tiers.NETHERITE), List.of()); + + public static final Tier ASHSTONE = TierSortingRegistry.registerTier( + new ForgeTier(Tiers.DIAMOND.getLevel(), 900, 16.0F, 2.0F, 7, ASHSTONE_TAG, + ()->Ingredient.of(ModItems.ashstone_gem.get())), new ResourceLocation(Netherrocks.MODID, "ashstone"), + List.of(Tiers.DIAMOND), List.of(Tiers.NETHERITE)); + + public static final Tier DRAGONSTONE = TierSortingRegistry.registerTier( + new ForgeTier(Tiers.NETHERITE.getLevel(), 4000, 10.0F, 8.0F, 27, DRAGONSTONE_TAG, + ()->Ingredient.of(ModItems.dragonstone_gem.get())), new ResourceLocation(Netherrocks.MODID, "dragonstone"), + List.of(Tiers.NETHERITE, ARGONITE), List.of()); + + public static final Tier FYRITE = TierSortingRegistry.registerTier( + new ForgeTier(Tiers.DIAMOND.getLevel(), 150, 8.0F, 4.0F, 7, FYRITE_TAG, + ()->Ingredient.of(ModItems.fyrite_ingot.get())), new ResourceLocation(Netherrocks.MODID, "fyrite"), + List.of(Tiers.DIAMOND), List.of(ASHSTONE, Tiers.NETHERITE)); + + public static final Tier ILLUMENITE = TierSortingRegistry.registerTier( + new ForgeTier(Tiers.DIAMOND.getLevel(), 700, 8.0F, 4.0F, 15, ILLUMENITE_TAG, + ()->Ingredient.of(ModItems.illumenite_ingot.get())), new ResourceLocation(Netherrocks.MODID, "illumenite"), + List.of(Tiers.DIAMOND, FYRITE), List.of(ASHSTONE, Tiers.NETHERITE)); + + public static final Tier MALACHITE = TierSortingRegistry.registerTier( + new ForgeTier(Tiers.DIAMOND.getLevel(), 700, 9.0F, 3.0F, 39, MALACHITE_TAG, + ()->Ingredient.of(ModItems.malachite_ingot.get())), new ResourceLocation(Netherrocks.MODID, "malachite"), + List.of(Tiers.DIAMOND, FYRITE), List.of(ASHSTONE, Tiers.NETHERITE)); + +} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java b/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java index eed1e90a..4d788458 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java @@ -10,11 +10,11 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.OreBlock; import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraftforge.common.ToolType; -import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.fmllegacy.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModContainers.java b/src/main/java/mod/alexndr/netherrocks/init/ModContainers.java index b94f2703..574c9571 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModContainers.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModContainers.java @@ -6,7 +6,7 @@ import mod.alexndr.netherrocks.content.NetherSmokerContainer; import net.minecraft.world.inventory.MenuType; import net.minecraftforge.common.extensions.IForgeContainerType; -import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.fmllegacy.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModItems.java b/src/main/java/mod/alexndr/netherrocks/init/ModItems.java index d6fd6658..9aa7a0bb 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModItems.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModItems.java @@ -21,7 +21,7 @@ import net.minecraft.world.item.PickaxeItem; import net.minecraft.world.item.ShovelItem; import net.minecraft.world.item.SwordItem; -import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.fmllegacy.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModTiles.java b/src/main/java/mod/alexndr/netherrocks/init/ModTiles.java index 98c8fc13..29ed683c 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModTiles.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModTiles.java @@ -5,7 +5,7 @@ import mod.alexndr.netherrocks.content.NetherFurnaceTileEntity; import mod.alexndr.netherrocks.content.NetherSmokerTileEntity; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.fmllegacy.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -23,7 +23,7 @@ public final class ModTiles { public static final DeferredRegister> TILE_ENTITY_TYPES = - DeferredRegister.create(ForgeRegistries.TILE_ENTITIES, Netherrocks.MODID); + DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, Netherrocks.MODID); // tile entity type // We don't have a datafixer for our TileEntities, so we pass null into build. From 0b363bd149ade235f2d3ae69d9468a6a137a5059 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Fri, 20 Aug 2021 17:20:15 -0500 Subject: [PATCH 07/56] added some new textures from Beckyh2112; fixed up block tags for mining levels --- .../content/NetherBlastFurnaceTileEntity.java | 7 +-- .../netherrocks/datagen/ModBlockTags.java | 18 +++++- .../datagen/NetherrocksDataGenerator.java | 4 +- .../NetherrocksLootInjectorProvider.java | 50 ++++++++-------- .../netherrocks/helpers/FyriteHandler.java | 2 +- .../alexndr/netherrocks/init/ModBlocks.java | 54 ++++++------------ .../alexndr/netherrocks/init/ModItems.java | 52 ++++++++--------- .../textures/block/fyrite_block_alt.png | Bin 0 -> 5793 bytes .../textures/block/raw_fyrite_block.png | Bin 0 -> 6372 bytes .../textures/block/raw_illumenite_block.png | Bin 0 -> 6393 bytes .../netherrocks/textures/item/raw_fyrite.png | Bin 0 -> 5641 bytes .../textures/item/raw_illumenite.png | Bin 0 -> 5400 bytes 12 files changed, 92 insertions(+), 95 deletions(-) create mode 100644 src/main/resources/assets/netherrocks/textures/block/fyrite_block_alt.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/raw_fyrite_block.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/raw_illumenite_block.png create mode 100644 src/main/resources/assets/netherrocks/textures/item/raw_fyrite.png create mode 100644 src/main/resources/assets/netherrocks/textures/item/raw_illumenite.png diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java index 2baaa0f8..db4ecf73 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java @@ -3,15 +3,14 @@ import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceTileEntity; import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModTiles; -import net.minecraft.world.entity.player.Player; +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; public class NetherBlastFurnaceTileEntity extends AbstractNetherFurnaceTileEntity { diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java b/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java index 3d335643..97ecd40e 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java @@ -1,11 +1,14 @@ package mod.alexndr.netherrocks.datagen; +import java.util.List; + import mod.alexndr.netherrocks.Netherrocks; -import net.minecraft.data.tags.BlockTagsProvider; +import mod.alexndr.netherrocks.init.ModBlocks; +import mod.alexndr.simplecorelib.datagen.MiningBlockTags; import net.minecraft.data.DataGenerator; import net.minecraftforge.common.data.ExistingFileHelper; -public class ModBlockTags extends BlockTagsProvider +public class ModBlockTags extends MiningBlockTags { public ModBlockTags(DataGenerator generatorIn, ExistingFileHelper existingFileHelper) @@ -17,6 +20,17 @@ public ModBlockTags(DataGenerator generatorIn, ExistingFileHelper existingFileHe protected void addTags() { // do nothing; super() generates all the vanilla blocktags, and we don't want that. + registerMineableTags( List.of(ModBlocks.argonite_block.get(), ModBlocks.argonite_ore.get(), + ModBlocks.ashstone_block.get(), ModBlocks.ashstone_ore.get(), ModBlocks.dragonstone_block.get(), + ModBlocks.dragonstone_ore.get(), ModBlocks.fyrite_block.get(), ModBlocks.illumenite_block.get(), + ModBlocks.illumenite_ore.get(), ModBlocks.malachite_block.get(), ModBlocks.malachite_ore.get(), + ModBlocks.nether_blast_furnace.get(), ModBlocks.nether_furnace.get(), ModBlocks.nether_smoker.get()), + List.of(), // 1 + List.of(ModBlocks.fyrite_block.get(), ModBlocks.fyrite_ore.get(), ModBlocks.illumenite_block.get(), + ModBlocks.illumenite_ore.get(), ModBlocks.malachite_block.get(), ModBlocks.malachite_ore.get()), // 2 + List.of(ModBlocks.argonite_block.get(), ModBlocks.argonite_ore.get(), ModBlocks.ashstone_block.get(), + ModBlocks.ashstone_ore.get(), ModBlocks.dragonstone_block.get(), ModBlocks.dragonstone_ore.get()), // 3 + List.of()); // 4 } diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksDataGenerator.java b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksDataGenerator.java index 17f24d0e..12bf50bb 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksDataGenerator.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksDataGenerator.java @@ -2,11 +2,11 @@ import static net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus.MOD; +import mod.alexndr.netherrocks.Netherrocks; import net.minecraft.data.DataGenerator; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; -import mod.alexndr.netherrocks.Netherrocks; +import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; /** * bundles up the GatherDataEvent handler and all the necessary data providers for diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootInjectorProvider.java b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootInjectorProvider.java index 496c01fc..5a5a3d29 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootInjectorProvider.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootInjectorProvider.java @@ -11,13 +11,13 @@ import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.simplecorelib.datagen.LootTableInjectorProvider; import net.minecraft.data.DataGenerator; -import net.minecraft.world.level.storage.loot.entries.LootItem; -import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable.Builder; -import net.minecraft.world.level.storage.loot.RandomValueBounds; +import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet; +import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; public class NetherrocksLootInjectorProvider extends LootTableInjectorProvider { @@ -34,27 +34,27 @@ protected List>>, L // desert pyramid LootPool.Builder foo = createChestPool(1, 1, 0.25F) .add(LootItem.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(10) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) .add(LootItem.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(5) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) .add(LootItem.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 1)))); + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 1)))); addInjectionTable(Netherrocks.MODID, "desert_pyramid", foo); // ruined_portal foo = createChestPool(1, 1, 0.50F) .add(LootItem.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(2, 4)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(2, 4)))) .add(LootItem.lootTableItem(ModItems.argonite_ingot.get()).setWeight(8) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 3)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 3)))) .add(LootItem.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(10) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) .add(LootItem.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(5) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) .add(LootItem.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) .add(LootItem.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 1)))); + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 1)))); addInjectionTable(Netherrocks.MODID, "ruined_portal", foo); // bastion @@ -96,25 +96,25 @@ protected List>>, L .add(LootItem.lootTableItem(ModItems.dragonstone_pickaxe.get()).setWeight(1)) .add(LootItem.lootTableItem(ModItems.dragonstone_shovel.get()).setWeight(1)) .add(LootItem.lootTableItem(ModItems.malachite_ingot.get()).setWeight(2) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(2, 4)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(2, 4)))) .add(LootItem.lootTableItem(ModItems.argonite_ingot.get()).setWeight(2) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 3)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 3)))) .add(LootItem.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(2) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) .add(LootItem.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(1) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) .add(LootItem.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) .add(LootItem.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 1)))); + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 1)))); addInjectionTable(Netherrocks.MODID, "bastion", foo); // jungle_temple foo = createChestPool(1, 1, 0.25F) .add(LootItem.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(2, 4)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(2, 4)))) .add(LootItem.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))); + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))); addInjectionTable(Netherrocks.MODID, "jungle_temple", foo); // stronghold @@ -127,13 +127,13 @@ protected List>>, L .add(LootItem.lootTableItem(ModItems.malachite_axe.get()).setWeight(1)) .add(LootItem.lootTableItem(ModItems.malachite_pickaxe.get()).setWeight(1)) .add(LootItem.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(2, 4)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(2, 4)))) .add(LootItem.lootTableItem(ModItems.argonite_ingot.get()).setWeight(3) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 3)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 3)))) .add(LootItem.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(5) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) .add(LootItem.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(1) - .apply(SetItemCountFunction.setCount(RandomValueBounds.between(1, 2)))); + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))); addInjectionTable(Netherrocks.MODID, "stronghold", foo); return tables; diff --git a/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java b/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java index 37396841..3cc888b7 100644 --- a/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java +++ b/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java @@ -92,7 +92,7 @@ public InteractionResult onItemUse(UseOnContext context) return InteractionResult.PASS; } IForgeBlockState targetBlock = worldIn.getBlockState(adjacentPos); - if (targetBlock.getBlockState().getBlock().isAir(targetBlock.getBlockState(), worldIn, adjacentPos)) + if (targetBlock.isAir(targetBlock.getBlockState(), worldIn, adjacentPos)) { if (worldIn.isClientSide) { playerIn.playSound(SoundEvents.FIRE_AMBIENT, 1.0F, 1.0F); diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java b/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java index 4d788458..42655943 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java @@ -2,10 +2,10 @@ import mod.alexndr.netherrocks.Netherrocks; -import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceBlock; import mod.alexndr.netherrocks.content.NetherBlastFurnaceBlock; import mod.alexndr.netherrocks.content.NetherFurnaceBlock; import mod.alexndr.netherrocks.content.NetherSmokerBlock; +import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceBlock; import mod.alexndr.simplecorelib.helpers.LightUtils; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.OreBlock; @@ -13,7 +13,6 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; -import net.minecraftforge.common.ToolType; import net.minecraftforge.fmllegacy.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -37,72 +36,57 @@ public final class ModBlocks // Ore Blocks public static final RegistryObject argonite_ore = BLOCKS.register("argonite_ore", () -> new OreBlock(Block.Properties.of(Material.STONE) - .strength( 5.0F, 30.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(3).requiresCorrectToolForDrops())); + .strength( 5.0F, 30.0F).requiresCorrectToolForDrops())); public static final RegistryObject ashstone_ore = BLOCKS.register("ashstone_ore", () -> new OreBlock(Block.Properties.of(Material.STONE) - .strength( 5.0F, 30.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(3).requiresCorrectToolForDrops())); + .strength( 5.0F, 30.0F).requiresCorrectToolForDrops())); public static final RegistryObject dragonstone_ore = BLOCKS.register("dragonstone_ore", () -> new OreBlock(Block.Properties.of(Material.STONE) - .strength( 5.0F, 30.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(3).requiresCorrectToolForDrops())); + .strength( 5.0F, 30.0F).requiresCorrectToolForDrops())); public static final RegistryObject fyrite_ore = BLOCKS.register("fyrite_ore", () -> new OreBlock(Block.Properties.of(Material.STONE) - .strength( 3.0F, 30.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(2).requiresCorrectToolForDrops())); + .strength( 3.0F, 30.0F).requiresCorrectToolForDrops())); public static final RegistryObject illumenite_ore = BLOCKS.register("illumenite_ore", () -> new OreBlock(Block.Properties.of(Material.STONE) - .strength( 1.0F, 30.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(2).requiresCorrectToolForDrops() + .strength( 1.0F, 30.0F).requiresCorrectToolForDrops() .lightLevel(LightUtils.setFixedLight(15)))); public static final RegistryObject malachite_ore = BLOCKS.register("malachite_ore", () -> new OreBlock(Block.Properties.of(Material.STONE) - .strength( 3.0F, 30.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(2).requiresCorrectToolForDrops())); + .strength( 3.0F, 30.0F).requiresCorrectToolForDrops())); // Metal Blocks public static final RegistryObject ashstone_block = BLOCKS.register("ashstone_block", () -> new Block(Block.Properties.of(Material.STONE) - .strength(7.0F, 72.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(1).requiresCorrectToolForDrops())); + .strength(7.0F, 72.0F).requiresCorrectToolForDrops())); public static final RegistryObject dragonstone_block = BLOCKS.register("dragonstone_block", () -> new Block(Block.Properties.of(Material.STONE, MaterialColor.NETHER) - .strength(10.0F, 72.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(1).requiresCorrectToolForDrops())); + .strength(10.0F, 72.0F).requiresCorrectToolForDrops())); public static final RegistryObject argonite_block = BLOCKS.register("argonite_block", () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.COLOR_BLUE) - .strength(7.0F, 72.0F).sound(SoundType.METAL) - .harvestTool(ToolType.PICKAXE).harvestLevel(1).requiresCorrectToolForDrops())); + .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static final RegistryObject fyrite_block = BLOCKS.register("fyrite_block", () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.FIRE) - .strength(7.0F, 72.0F).sound(SoundType.METAL) - .harvestTool(ToolType.PICKAXE).harvestLevel(1).requiresCorrectToolForDrops())); + .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static final RegistryObject illumenite_block = BLOCKS.register("illumenite_block", () -> new Block(Block.Properties.of(Material.GLASS, MaterialColor.COLOR_YELLOW) - .strength(7.0F, 72.0F).sound(SoundType.GLASS) - .harvestTool(ToolType.PICKAXE).harvestLevel(1).requiresCorrectToolForDrops() + .strength(7.0F, 72.0F).sound(SoundType.GLASS).requiresCorrectToolForDrops() .lightLevel(LightUtils.setFixedLight(15)))); public static final RegistryObject malachite_block = BLOCKS.register("malachite_block", () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.EMERALD) - .strength(7.0F, 72.0F).sound(SoundType.METAL) - .harvestTool(ToolType.PICKAXE).harvestLevel(1).requiresCorrectToolForDrops())); + .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); // Furnace - public static final RegistryObject nether_furnace = BLOCKS.register("nether_furnace", + public static final RegistryObject nether_furnace = BLOCKS.register("nether_furnace", () -> new NetherFurnaceBlock(Block.Properties.of(Material.STONE) .strength(3.5F, 12.0F) - .lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)) - .harvestTool(ToolType.PICKAXE).requiresCorrectToolForDrops())); - public static final RegistryObject nether_smoker = BLOCKS.register("nether_smoker", + .lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)).requiresCorrectToolForDrops())); + public static final RegistryObject nether_smoker = BLOCKS.register("nether_smoker", () -> new NetherSmokerBlock(Block.Properties.of(Material.STONE) .strength(3.5F, 12.0F) - .lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)) - .harvestTool(ToolType.PICKAXE).requiresCorrectToolForDrops())); - public static final RegistryObject nether_blast_furnace = BLOCKS.register("nether_blast_furnace", + .lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)).requiresCorrectToolForDrops())); + public static final RegistryObject nether_blast_furnace = BLOCKS.register("nether_blast_furnace", () -> new NetherBlastFurnaceBlock(Block.Properties.of(Material.STONE) .strength(3.5F, 12.0F) - .lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)) - .harvestTool(ToolType.PICKAXE).requiresCorrectToolForDrops())); + .lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)).requiresCorrectToolForDrops())); } // end class ModBlocks diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModItems.java b/src/main/java/mod/alexndr/netherrocks/init/ModItems.java index 9aa7a0bb..93245427 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModItems.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModItems.java @@ -12,7 +12,7 @@ import mod.alexndr.netherrocks.content.MalachiteAxeItem; import mod.alexndr.netherrocks.content.MalachiteSwordItem; import mod.alexndr.netherrocks.content.NetherrocksArmorMaterial; -import mod.alexndr.netherrocks.content.NetherrocksItemTier; +import mod.alexndr.netherrocks.content.NetherrocksItemTiers; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.AxeItem; @@ -87,87 +87,87 @@ public final class ModItems // TOOLS & WEAPONS // swords public static final RegistryObject argonite_sword = ITEMS.register("argonite_sword", - () -> new SwordItem(NetherrocksItemTier.ARGONITE, 3, -2.4F, + () -> new SwordItem(NetherrocksItemTiers.ARGONITE, 3, -2.4F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_sword = ITEMS.register("fyrite_sword", - () -> new FyriteSwordItem(NetherrocksItemTier.FYRITE, 3, -2.4F, + () -> new FyriteSwordItem(NetherrocksItemTiers.FYRITE, 3, -2.4F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject illumenite_sword = ITEMS.register("illumenite_sword", - () -> new IllumeniteSwordItem(NetherrocksItemTier.ILLUMENITE, 3, -2.4F, + () -> new IllumeniteSwordItem(NetherrocksItemTiers.ILLUMENITE, 3, -2.4F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_sword = ITEMS.register("malachite_sword", - () -> new MalachiteSwordItem(NetherrocksItemTier.MALACHITE, 3, -2.4F, + () -> new MalachiteSwordItem(NetherrocksItemTiers.MALACHITE, 3, -2.4F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject ashstone_sword = ITEMS.register("ashstone_sword", - () -> new SwordItem(NetherrocksItemTier.ASHSTONE, 3, -2.4F, + () -> new SwordItem(NetherrocksItemTiers.ASHSTONE, 3, -2.4F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_sword = ITEMS.register("dragonstone_sword", - () -> new SwordItem(NetherrocksItemTier.DRAGONSTONE, 3, -2.4F, + () -> new SwordItem(NetherrocksItemTiers.DRAGONSTONE, 3, -2.4F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // pickaxes public static final RegistryObject argonite_pickaxe = ITEMS.register("argonite_pickaxe", - () -> new PickaxeItem(NetherrocksItemTier.ARGONITE, 1, -2.8F, + () -> new PickaxeItem(NetherrocksItemTiers.ARGONITE, 1, -2.8F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_pickaxe = ITEMS.register("fyrite_pickaxe", - () -> new FyritePickaxeIteam(NetherrocksItemTier.FYRITE, 1, -2.8F, + () -> new FyritePickaxeIteam(NetherrocksItemTiers.FYRITE, 1, -2.8F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_pickaxe = ITEMS.register("malachite_pickaxe", - () -> new PickaxeItem(NetherrocksItemTier.MALACHITE, 1, -2.8F, + () -> new PickaxeItem(NetherrocksItemTiers.MALACHITE, 1, -2.8F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject ashstone_pickaxe = ITEMS.register("ashstone_pickaxe", - () -> new PickaxeItem(NetherrocksItemTier.ASHSTONE, 1, -2.8F, + () -> new PickaxeItem(NetherrocksItemTiers.ASHSTONE, 1, -2.8F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_pickaxe = ITEMS.register("dragonstone_pickaxe", - () -> new PickaxeItem(NetherrocksItemTier.DRAGONSTONE, 1, -2.8F, + () -> new PickaxeItem(NetherrocksItemTiers.DRAGONSTONE, 1, -2.8F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // axes public static final RegistryObject argonite_axe = ITEMS.register("argonite_axe", - () -> new AxeItem(NetherrocksItemTier.ARGONITE, 7.0F, -3.1F, + () -> new AxeItem(NetherrocksItemTiers.ARGONITE, 7.0F, -3.1F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_axe = ITEMS.register("fyrite_axe", - () -> new FyriteAxeItem(NetherrocksItemTier.FYRITE, 7.0F, -3.1F, + () -> new FyriteAxeItem(NetherrocksItemTiers.FYRITE, 7.0F, -3.1F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_axe = ITEMS.register("malachite_axe", - () -> new MalachiteAxeItem(NetherrocksItemTier.MALACHITE, 7.0F, -3.1F, + () -> new MalachiteAxeItem(NetherrocksItemTiers.MALACHITE, 7.0F, -3.1F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject ashstone_axe = ITEMS.register("ashstone_axe", - () -> new AxeItem(NetherrocksItemTier.ASHSTONE, 7.0F, -3.1F, + () -> new AxeItem(NetherrocksItemTiers.ASHSTONE, 7.0F, -3.1F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_axe = ITEMS.register("dragonstone_axe", - () -> new AxeItem(NetherrocksItemTier.DRAGONSTONE, 7.0F, -3.1F, + () -> new AxeItem(NetherrocksItemTiers.DRAGONSTONE, 7.0F, -3.1F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // shovels public static final RegistryObject argonite_shovel = ITEMS.register("argonite_shovel", - () -> new ShovelItem(NetherrocksItemTier.ARGONITE, 1.5F, -3.0F, + () -> new ShovelItem(NetherrocksItemTiers.ARGONITE, 1.5F, -3.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_shovel = ITEMS.register("fyrite_shovel", - () -> new FyriteShovelItem(NetherrocksItemTier.FYRITE, 1.5F, -3.0F, + () -> new FyriteShovelItem(NetherrocksItemTiers.FYRITE, 1.5F, -3.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_shovel = ITEMS.register("malachite_shovel", - () -> new ShovelItem(NetherrocksItemTier.MALACHITE, 1.5F, -3.0F, + () -> new ShovelItem(NetherrocksItemTiers.MALACHITE, 1.5F, -3.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject ashstone_shovel = ITEMS.register("ashstone_shovel", - () -> new ShovelItem(NetherrocksItemTier.ASHSTONE, 1.5F, -3.0F, + () -> new ShovelItem(NetherrocksItemTiers.ASHSTONE, 1.5F, -3.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_shovel = ITEMS.register("dragonstone_shovel", - () -> new ShovelItem(NetherrocksItemTier.DRAGONSTONE, 1.5F, -3.0F, + () -> new ShovelItem(NetherrocksItemTiers.DRAGONSTONE, 1.5F, -3.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // hoes public static final RegistryObject argonite_hoe = ITEMS.register("argonite_hoe", - () -> new HoeItem(NetherrocksItemTier.ARGONITE, -1, -2.0F, + () -> new HoeItem(NetherrocksItemTiers.ARGONITE, -1, -2.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_hoe = ITEMS.register("malachite_hoe", - () -> new HoeItem(NetherrocksItemTier.MALACHITE, -1, -2.0F, + () -> new HoeItem(NetherrocksItemTiers.MALACHITE, -1, -2.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject ashstone_hoe = ITEMS.register("ashstone_hoe", - () -> new HoeItem(NetherrocksItemTier.ASHSTONE, -1, -2.0F, + () -> new HoeItem(NetherrocksItemTiers.ASHSTONE, -1, -2.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_hoe = ITEMS.register("dragonstone_hoe", - () -> new HoeItem(NetherrocksItemTier.DRAGONSTONE, -1, -2.0F, + () -> new HoeItem(NetherrocksItemTiers.DRAGONSTONE, -1, -2.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // ARMOR diff --git a/src/main/resources/assets/netherrocks/textures/block/fyrite_block_alt.png b/src/main/resources/assets/netherrocks/textures/block/fyrite_block_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..4d832e6f572db893ec192fc50aa73cc513f8c662 GIT binary patch literal 5793 zcmeHKdpJ~U7aw;fBG;i}nnKcC&BaVaE-}gFpo>b`GqYzJ%*D)LQb{VEQf?J>2z^O9 z5}kBUK1r0zsEAWxia1G1Aw~N3OzPD0oqu|s@B6QrXV2`t-nD*ft>0Sj`|fv7fS;Eh z+yV}R!Sv|f9)Zxmf#TBEgnq5wega@HjfuG6)sjFU7AX`7*xX1EDcK|hk)V{zhQXu{ zOIC$s)Y#}w^choC4OMSO;e1x`)4EUoIdHL|An;K8Tisj8g2AP@!jB^y$~HM8ko@#` zl5t{s}{f!8M$43Tygm;90IE&13Wt&84GDJ^}cJ^XuZF_WK? zQ*+?xLaoPR=~3n;HAZ@Wd1D$f9rL)GRbAt6+`cXa7l&Mq81@<0vcsH?*^v~Bs}7xP z_nYLrZrnKrvR4fr>3ZlHIicG(5my=>C$PV=P$eyCc8d=9pn1mY{(tA^;p|l#M%UP2{MW8^_u?DAY`%MZUBrGyhbC-B@2D_o7NTr>&Pi7? z!3!lXlG|3NG48(BfY)t4^E#vEGE8)^_A$bUI||B*&8gEoqzenR!!zpT%hKBO^X9|# zz*pC#uXd!a-};7n30bwmfMD#i2x{mLZi#3v3MX>?a%N>5_n%W!V0R)1 z&rN!^@2>f5(e*J=*1Adfs%yi`R$|d;iuOGHSV`4XeoGa zx+d~rVEydC7iWClIS;p=Kbb3dP`7YR<={4%#q0-C0*Q7jo20vc=x~0z--KLu-&q4h z>JAm{-?TU@={pc1D?TlVi__FRF=O11600v3Tr*GqbaSRvZ$tjzr?4j7 z{&-+8`=ZtAV&+A=2S;u_a!nXBIEO$ZQtY4Drh@4?d|gKc_nImdx6kdp~p_FogV)`FxAyuz$np zxfO{Q@2cEzRC5a*bwRhkvP^7VI&&DG?YcRmwKy}zO*0`Y?|fZL{zKA-gXOA(+-HZE zEVMcr89LpTdX^vNF+3^3iRR8m`!wHS644O>$2+}!LaVXpj@x?zYB@VItyUZ6&EU#r zB|ft9*Ldxmc_-Zf2CAGx|ac1WdaVjsK&w(C^h$SvE$ z!oJk3fQk@6eo1UPva6&bPu(PT!+?2Xs_(XI07WOh^wi$q^=<$14NlXf=or2&%^2^y z*U&vCNwaL-rB%10=6zX9{DFFn(@kl$zl7fi6SXE0xAm;Na}?KP(R%$rR~B}W{qm5* zZA&gL(A=W$Q#EcREw2wZ?MU;FqaO$v4)bzZ7LrWAytBfnr~2{n^6~qPB0{}SB_}Ym zgUdRy!`Ptz-I_z!a5cbEa;m$L&4&}0&x+_SK`*h-It4p(BRMgJcWr%dS&MF5-YlC@ z^vuEQPxG?&k`HO_YK3gU+8$BG*&Ra~(^70Ha7w`QX%EuhG%jDlX?&F2)|O5bcYL_w zZR+luCyB|5cyj7kPu7eaq@-Tg%e?dIlbcNde&Kw#_zMYTZA|&0)b$z{INQBAdGpsk z3n{j|B6PYe)0}2I%Q7{E?=Ozq^?E4|GlMcw{nj+T>j~$$z4HR+kOBIBzQ0iu^>`$o zb3r@SWY?w@3y!8&mCz65rkiDz=iG2n&y&7=$bH$i`^3B)_=UPZ);}t1^<6yaP_oF_ z`F2;KeovXYZ0VNb((bgZhOYVDJ9=Fwt`>B7UA7CM7YVsw%JM_Z`XS&P+d(h#XUU z+S^<37s@(5%XrOAX>FALtF5oiwKSV7Fxs(^8G!R4%U}?A6vC^&OO~@UhK^D zhJ~yri>?pOkdKG%d;}j*}V9k zD^G`J_GQ$o%8VN$<5E`7%Um}5v;=3LZ82mV72GPhV>gEY+9hl(kTe&$r-g# zA`#NC*x1-uOsoS&AmU*0R4NsVBVY*xG^BwRZ{kY;DVi^ytAO~7;Q@-7BCb%v74VS? zOn@PXmN=tO&^Yo-d_1AA?^k%fc!~vx53CdrV(}OpmdC?>Yay0+#y}ub0sW(eI2d}p z!3Kh2L9~bodd7f!$=q)tSj?~X!e~*XG94BZ3r2!GNL37Z#ee70i|!ln)j~l5hszTx ztst_$)0A-8f0OlHY>E+OI^PBYnSaIoPWwylN@YmP*O%rYU`8v#qkA}`6#i)}0h7z3 zDQ~GbHVb4@8E6M8o`@#09URb(I7cR$$z(B^Y!(g&k_g{G(fMKtz-NLACV1{ zNX1idAesPB$Y>%!CZiphY!D3+nGO^PhXIfn-$3|_xKLLDk>5t8fMP*VYzG_wI5HS$ zki;TD(SRTtz!4~DiUXBICK2%@5Fja`SWMbdfrtk{<>c}J4u}=2q1Uxnf9T zlcMLRx;_Yu`uy~H5=3&9LrA2uacKbavlB581G1EkAiK{)%#8q_141)=s-?cjx&Kfu z3d4ayp#lsvn@R!EL?(%ecEqztXh)C;QV47|k<6rik1iIlC9!}AT*84eg|dNKNSO_C z{uG&Z-|NS21Qkr-2zWHk5lz4aPd!AL92XT|epiAqIX(`Db_ir0a(m_#x$=-St1C z3;y?U2joL}P3krqV>dUH#XPX)Wyb_4>IaVMMlNJ9Xo1_3r&K zncHW0tIowG)T*UM@5!y|d>%(ey=rl>9$Tsd^9PXuVFsas@WY17RksGJ70nu0*q$9Q z$F&CTk!hByx;*d7s7i{e z9jEM6@}&M%$ISUH500IWW*Q)di*6jNx$xvf~NL^>(s>3C#1 zKB_kyfyohj4=zV!ETdVE?R|Z{DEZ*?Ht*_!D}puJ$2^+kJ5pe`CtEY*5iQBJ>Ur*) z^f$fn)AYD+Bg%Zj`Xm$I$`zDtEUqbD-s?58O=ZK%t7c<$efm&AV02GEk27vziT?qG C^A$M& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/raw_fyrite_block.png b/src/main/resources/assets/netherrocks/textures/block/raw_fyrite_block.png new file mode 100644 index 0000000000000000000000000000000000000000..8b97d2b232baf703c7f01f13bfee8a390bd40238 GIT binary patch literal 6372 zcmeHKdpJ~U`yPkTgrpoIj7g=KqZwuf$=Rrh5JEJEHHhwUe|7%+iwc3rMnt%I3SFq-Fdm=FWCZ~*;cgxP14Jw)1R{EV z#lyQu&p>h3U!_#KWcO~OS>Cg1!)Qr#wrhTQoWc`c8l#oB?Ve*)$&)she{`^o@s*~tml{$JSxZVTV|J@3j;T?8hMl1P~rZZ9S}Gy zL;377$8@_oIes5uT1=+PD@&k95*<4)JeDQn9J5Q$G0Pbdzk!e zO1e*cyl%4PIlcRE7pN+t#Ai%c9q+PXdr{?n4R+xljtGSbR^>ib@4#m`R-WsC;;F%_ z`KQY#u-%a3`*ogv&>ff z%k=E{eJho$t0Avgx)7@;cONhZ%rh4C+5PfjUQKRBra3?eMt4N`Gh)cy)zVe?V zJx0#5^Y190x)HQ0q%hRvY;jjb=+#wS3KBzIF&91aS_wy=I;NhkTD0`EZQ}c;JiNhc zv%u~!TAFfe2DLWK@3ApWqT}<)ku|C8_uWbQxmG)zjw#2;H7HChY3)DF*mL^#H_QDB zL>8u3+H>`Xi;QYNZ&9y3GIA}UZc^2$+j^a`q3vziB2L7mmiV~=R?^17Cvv@qoq~O} zN>XEZJ9bO+xsXEy{c)+-sR*dO{@9I?Cg5w+9tJZLk(4v zYZK4?YCQuD8~GL)nq*IoWRCKs zCd(9h{enRG42QPTT%NNbN%PbX+872Qli-wcV{ibKwu*mL~PGRnHg4%)3=g-5s zbaa|mb{iI4@g~-KFWQ*hqI%zbjoS)|!;kQqPv6zU9&DC&n;%xr+}km+lo!FzYEVD} zYe&3YyGzbox=1MMD9UK$T3f_5W^QV}F*su#zh%ti%x_H%iA?*dp=w79o<>K#&VG~q4Fha^#;{CYtF|I*}3MfniqFZ3_k?~kzxLr>p>T58!GO9&I_q^J@?U0 zj`OPUkJHfe?)isbYjj3sNWAxUB>J5@;^9M`PW*H^e(=HC0C`pOwFVPfSG+@Ie`}5m zBpjLtlTftM)F=i0otVdBEfC%s4^>{QJI^;e*h?=6rTGke+}ST=mf4ZieD&z-xcro0|e zzD_+LT+t7Ue=_*#RsQq_?`EU6(tdf}&nkn5MyH#`vjz}nbW5R1y#t9)FI#V{QT8Jy zxl2^98mKHB15Ddm0@PzQbuBE~wNlWZz4zR?C+ci3AtO{ow^Qutl!8lEW}VzrU+==ygJBy6*Vu!DC$E>)$Z}a}K+u+tU)| zwj*TGZxf7hMwNq6WfwmlR%7RGR`DZ`#|>5)%N^FB;N^7^M+;}_cJ-)!#J1p|TlPN6 zaVsELO&Y$6%peYGx@?0l#NZspTD|wcYkm$_kXTZunthZO%@t+%1*Qk7zqv_T=@*x_LOjOb=E;-BxV$ zzPi3bBXH&-d)eW-c10`c%E^SA#L|b+!0761q+Nj@OJib`HosK4Ijy&TPw-m^L?WJL zZS739w*LMU2A{pzk*VemHJjA;_g)B0bX)ZR_UcFuX@`qEQv?{sh& zz4gfCSax;wnYzNb#L^ zT#xaSgJs8>iXC!1;&of)bL^SvsSgYpFHI{)m-Wr;O!EKybdLC?Ew(Nu#>T8k{>fV3 zb*EokS9mm23pZ%mFisplNmkQ~dVTBFxaL4wljP$S4}&6-J@wKZwJr8D?;4b zg^g-_?MvA=3G8+acF)l&v`g~|BcFVHlC)~74ODqWo3o{gG41;Bc~6HYySp1KUVm|Y z?Q(Cs#Oek!+f!m4~z=_sMMA^C}!MC{``$6riw zaWNTAt-~Bdg!BYgO6@6!@=OXD9#g%}+8FSFwkjX8?VC%gT)$MlTk`fL-(If)LL}r` z+oe3szCI;&#I~u-$K^GrB4=)1Xs^;)lg>ZTg;(|gcT4Ila989>*+QaoIY=slO9PN1 z4iDTlK_F%pA|92_281vg;Li#+hkq!qg2Px0bGQedf~N4SfdH061RrpX*y=`)VAF{V zxWz`OnTP}uZ~!3{CgKDI3rHe!_yR8pJQtf$aM%Jw$To+2Qk-GdTs{E9A#q4F!dAoz z!@@U0VP<>=ljLG!_l*L)GKU8Ug**}p6&@ar3^zh@`Ti&jkw`?Lu_!DS0U{8B-N8bt z2oWq;EvER&VFL*0d=^j0;s(RSoKzY&RA>%|gX6I8`Ehs@%HQnE#0NQ*Ppsg>rsO1a$wK_b2rC+84ke zib5gTaOt7q^vE{maB+MRgG*;INDHSl96-ZjnHYqzi3tvYBch220@}nFL1)m62zV?O zZ$d!-Kt&D~2&utzKuiUaBUvC10c%79j6ez;6-z_l@OS`0V;bQRCTJ5pXvb5H0qhSH zPJ9;FmDHdgvl3G=Kq>~6YRn`W86j{O92J41p{WQemVig#&9e*nb`_Fotf3r@0hCY!^t$ghbnSe%2XLMG?{t^rmsgBvdR2kge;0Iou+ zSWk>GmWU(bF(yW6EEbE#`~z|a_yVvO#jF@K5{p|H5l;*WEC-a9D(+N}V8ISnL$c-r zR3Vq|#^nZ?!^J7U#GVTc4m0~YEeY|1w=TaHi=DCV)Uw(F6nzz~d1FBASW70N`vB z88kEoNB@~!z-0=+6`k&GQyJZ zMsU=(Vo~BX{k>W<)c?`LYyt4YO#t-!Y6EXB;Jpg<_s!~?USbLVho5ir@IQ+|?{Hwcu$@Q-k_*dXx-Sz(_7xbUk9UvIo0fmDvGsD_7vEYl43~jT$ z4dgHJ_w4Qbqo8Fm&tZoE0$H+Ld`Lhtv(-VPtdLBxm32|eC8IW=bL-i3zPx8e1U5=s24>dO?z1$lS?|L^Y?Y5ry6A)4Rb(wPYmS@%^#JUC4VxeN3Izi0J3#Br8Zx77FBu| za2p=4Ph(oJgO2UtpRFIM=2}&8B1<`;#l{->6PFzHoL*vFubV^lOx> zJn3^Me95~fP&a?Nc7Mv<*zGIVvJ2l&B3t(-Xw7>E zMyi+AO$@jk0^A0p&j^xJ60VMpth6w{>Z!Ym(s|c!@VLBUeAo1+<11U2oh}}m&Xx14 zC*soS-?Y2`LT-xrC-(Ysd&7&hX#GhUytF3w=VH`|P|7H|}IaZVIZzuTr$pRPqAoNDloJcw%9aqtFBG41Wv4hJi@+aFg7 zW<@9~BwVvEOEc(IYnOhdrrtx3%!rfG`a+k2e7A%a{VO}($>hwP>Rpl$@-F(qT$^?d TcIF+}RS>f6R+}QLU9tZGtoSs6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/raw_illumenite_block.png b/src/main/resources/assets/netherrocks/textures/block/raw_illumenite_block.png new file mode 100644 index 0000000000000000000000000000000000000000..c4dc7c821de855a306cb8b1bc47147f98625778a GIT binary patch literal 6393 zcmeHLc{r5o`yVO0QduSr#@MpVYKED~zB?NGPBAMJW|*0bESXRzDcMS*q$rh0DUPDe zzLx5UNFtOXsbuZ@j_RDce&2u2b^X5oHFLf1yzjky?)&~c_w&5ZJ1H(scG41x5+D#r z+QHu14fvH29AYBCS#{;wk>n*c1zosouv8Fq@BRt!s?H6WuzmbR9jE0y&q;0FDY+%uqUh!)Z#MD3pQY$A zx4z(=uY>-NL>z?rI|XsmUUqewczOCuJ=O=g!acNzjhNjOKu9(J6k`n}W{Tkx~&itwA8P>2OKPc{QX~gCEsG}hn2mSNxhJ*+~ec%x z`sYVZ7iarbFdACroV~Y}T#J+>`h}f;dG=CepG5)O)===v}(WJ>nVos9D)3LHWy;9bDI8(eoy#TO~se@~1XbzSLm0 z^T84#GF?hSGRKYR+Z~bz_Ax1=lInWUd#%-XHdU?{PDG~+pH{em7%`3DK))z3<1#o( zH3_TmRfP+Z>|2ow!aFG5d6P-8GJTBdq}RgTEE@RC5r5T#(i$5sL=JhV7fk2QdoW}3 zUr1mX$6kLjA?bE4j^zeNy|wbgrAj51V^6ALEn4nI%WuNI9XB0btLZr&5bCU0>pQ$& z^+ZiVvHhna=M+_|`q_-mc1;X@l2mutJH;2XokGbjbA)NY4^=|IRGR z?NyxkQ#vGkPX;SYVWH8M*flVDF^k8mS0SMhS{iC6%$>y+x0NeA>J65?bgaTc?rj!t z%tEN+@ZlrBV-?nG_ib8!lCjiY*(u%ZhP!taHQy8e>b3RKJGz}dd28O~nzFX8qQ>1^ zne;3JrD@x(`uq^vlrXva&st8eVsCp{zp7Yz;Cp*@&27t>&WLWEwdqgGO&_Wy#^m)M zSX%(IIM;toLAcE^PNStiDNQf`O=G>d#SM!+ibt9D9m+#dzUiYM&0KVB-FuXVx4_dW<=L}m>`CJ?ICpCI9%txKApD6{q zaEf!qq&&FjI_FBM9iRAf7ltnwN)(;Hn6Ov8YTit#Kh)JN1t+0?TuQ+7Eq5es*JPQ>-hI)&5f2d7y9i&Ayb+hZf4m>bP9R&XHYe zkIP|3FAbu%J$oTx&MKDspj*ZDKcY8zMkS!RyHizf^lF{uUf%JTKVQ0kd7dAt@E1B0 zpG?=wwX|6LbTeWuBT3Hb!%;i08q&K(?bB1^d7lfM@JaO0H7jvB!&3Gf=bk;`yiMGrQwcz=o}7+$;I| zhZAQF<>DdE13H`%4=jy~@`?>{qH7l!gvGEiv@Yoq~o7NvT)M)|MqgJ`2AX z9W5G%YVOXF^{bC=id;7pKh-wCpGw+ri+uo+bSJqr?V2-`coM>Y>(l?UT>2^QIAmAMK z;A;5{Yl#iAk6bL|49S%fMLzZqcl9@!jm*1`xHWqUsW%xLp0bEqdYx}G z`aP2hO>8z9LUsZc?`=H+#E*^B{(Zyn==g(!pFxOAVyKdY&5x-D%_VF!M z&71%{|7+gAx-;!Be4TrV_@{1OOnM#w9_b!^4;yLbM5V z1(yI^3&aR0WW|IVY6A5kx!;iVnw4^XOayTM8}}#c@3pTO16D*L!J0+cDM-)3+5{?yPoT0W z3@YL4B^HA>FvL<|Xf%=p!{D(r7>+{1!zd)IAreWUk;!C(AD|qV94?7Tp$VV>a5w|N zLE+J40~`(u!;$euFboMvhv85d9E^@cBdLa13=NGo`~kw5%>cTR6!v3Q0w^i~g``r@ zB$^QkhC~~pVHm8DA&?E-07j+JsZ=DDNK1_p)zE&mvK z(bycI7X_#&Bpi)d(Fg{H0F(nzOA>S{0I(tlsv%ghX(TR-?ZIM&nLq_eK?I&F4GuB> zIxO}K4q&lM(DUEA-klct_3rB=2xF|MAdr>DC6FjzgK$VuH0nwq!0)Sy5<+4I(|{TN zt);%p8UJm#Fh)oe4TFNAut+2fL!$x%N5>k%sALM2PDUZ|G$ZoQ=o}WE%OkOA7QsNJ zKs7)MtyBZq{EbYVpY3@eGyzjcGzx~q!O%z#6qbNBAYgD%#J6G*f;s)YT4Tij;lp^v z;D<#3@cSwQ78hWxLj1j0ed9|&;s5aSZ5;lG5di34LH-rLzv%i!*S})mUm5@Eu3vQh zD+d0R@vrXsf1^v{pVu846W9UqfR~wSd%YRpMM#9~XlD)jBKV%FJ(mSY#3Sr|IUtba zM!_KjI-U;(grZyrqK)WFF~F$uR!XX8 z)Td?{&Ii^Pf%gryFLvUmc4?yzqn{2^7p!A`2mWOcUsr#QXMI(#_Q=VWxrd5_caLYj zRoxnhGTCS=)k5ET;r8V5H=W4yW5qQR1aj@XY3{@DVe6wh0|vc^a)m0Mlr3ZSEjFs`^hevcPcGT4kZ1OYhQ>O5 zQH=@|dFE_LnJzv7dgGjDZ&{kQD8+Ts%lVji@D(W_lPJocimAQC-iZm{p=6x$<2s{A zxsLKHOTO3t`0LytD&F1B-y`FkfBXFJVFT;^W3S|;zFc#Adu=7|XsYnpqR2I@^;-@n zvvjgUqAn>vSh}bALFK^c?js4&?IOL#^h2C$k4=wzjc11qb`wVy`I;3Rg{Hgs4$7stUzSKS*zNX`4W(UkM}5+cWzAL7rvlH%8VwDfJeE}}nNZq1R5(7kVd8P1??epz zM$Wb4ANPdVeS8=;D5o?VsnJGSQ={G*9#^K&vGc*3`yc904Ygheo2Jta)-`WKRl`M$ ltYcBV8;pK^AX2SZ4mlI)S@j%~!9BiDd%PfNu{{w;+K2`t# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/item/raw_fyrite.png b/src/main/resources/assets/netherrocks/textures/item/raw_fyrite.png new file mode 100644 index 0000000000000000000000000000000000000000..c5bcd436513fbb35c98ed3f9032c92a6f103883f GIT binary patch literal 5641 zcmeHKdpJ~E8y_K(N^(oeG^nJx8pF&nxs6*L(hw@i%$_|Ab2BqBln!!Ax=|B}LJ6hh z8l{_ZDTAb>i!!8CM9Jxtl5fwX+xMM+dY*776DIcuW=>go~p1ARH94m@t_5{wcq; zdwUmYe(clPsFDDy3AeYeeH66k()Jo|M`8X#X5-4O+Hg~FnOENU-$R&j+2gy!$6Im_ z0OjxA4U}0tGp%0wM7-~>hK=LJ!F>+gA|ZZW zORXNSVe{r26Z-0hCT2) zw5!qF_IjnGFyY-9%l?WtTLQN24~}dZGC-zdM~92vB_`Luy#2iK=GEGyAVAky1-nj|T zgXM$|FEUbEn$>rsc7I%u&6P}9P|1el1#yJR1$*AX4q~y{>(08gotc!NzERDNt|UCwiLUD*Wu`H3!2wy%w%vw^601L@%Ws99W9$-ha_R3G(3X`UAJdQ^Ft* z9=t$goV>B_<+M=FVM6FVBlTu{rbETfk*f)Zla_cezQT8 zQL&o+BkB_A$EM!Kd0AH4)@OFn()5ITN_DLA;tKDdJ>PdBE_9yN{2_7r0L7#^F@0{S zny2JRuB-WPIn}OXNTf$emaM9Osd9p0dBXn5Nj@!7BBj%9p{`H0nap%uwIn(ky~dmq zX(=8&ecV<*4;fNeW>Vn|>wf8)ZAl5Zs>f#1$#Tze32IPR&Hl(Rw-8-ELL->VgAm z+|;V`gXfOg9^s$*&8Rjhw~NyB(rlON-*+&8N^L_S!{d1c&`3f#IWl}>w!`ZPvRQg-E+z+Yw|@-mehMR zH*qufde-WZ2T8B|%D|7!AC2F8`6cnRoyK7>r399flb5@b)0br(TFf(JQpj#s?G3he z<%RC>F=~SMB<|j@cWK2;^^)8y4YBXtyJ^Yg207`AC*sQ`B00nkS=~re0{)O-*j{D zxt`Z^`u0jE-Oy=fNALDGO=1gZd5c4U`(|ae4ovw>*4o`ii!G4l-J0gr}_E!ST4KjEan{ zS?ELn{WRLNlbmH^J1?5g(CnOap)jy(O`lB+tn_x_u{koCmH~3*+k-c%uO5o|P?^_$ z$=EDakodq#I{?~#4Oq}N>+kV93E**1GzO0jqQo3Nv<<^xwsvAZ4G058a5@;w;*t?V z)t3-(7K4oNv+}@r@SVUAmRqy{^p5uQ0iweIA_HN!RKr$Gf&e(6hz1vP*jyn=Ohzbh zNzk)gj7Go}CZaGh!r#LS?!*&-a6Af+!XTZ+tOy)psRrCuz+jT76qgAI=#7jB5sCOD zG&(Xe5*2BQ;t7J$SR#>##^BI691^lX3Zu9pni$Cyn#dtOV^BaLAYk!DEFKpw$E4AD z8$@IT0@B03#K+-#czlKD3MW{A_&|$kd^8q?L323h?>&Sf=LiU7BA|ct5c)u0D`+Yx z|8C!V4n% z2TKu)`Hid}Vv}nW>3kmuL_GcMvNCET}4J?C+zJLopyIB8Et?WYFnI1_sA~ zq9NdrL>$2yX=#OHFsz6m1`F6Ipcnwjg(u+9py6b3Xu%+w&ka^6D(kn2-ZB2UuJNFH-nT<-_8D-XfZuPb>jP#1kzESWBqIS`xn*`GNu=REu&{ECz+c zD>U+fAwlUt)Y9aY3IQnOP&Ond0Z0?^1U@_-n~abL1($m&3LI|xd05<7LdYUYUh@-G z?+u23e)~KL*erz#4p$T|i3WV`L`aJOKNAZ1eO3V>G;S~m&G3nm`XXoj!*JoPu>g^Y z$0G?K9pc!EKtR$7SRxXKXEK-=XauYY|Aj8(F-4Iy0q776WeQ~jm5?GE_@W6i%@t{X zjV3Y#lrx3FVUZXcBo5<)C6F)#l9eR_J&`P0KBvEAYm5FLK5P{R-z@@=-)9-LxIk+a z`s-pf!IzxEfAKdl4*y~g5cIE3ev02;bp4|1rx^Gt<6qVFi>{wy;HQj#RoDNGE{$); z9gqus0YyTGneKXBGw2{RnZDeW0vnhAvoGZDgCtY_Webas51i!>?aWC{7xAIyvOukzBXW+wmMdY%G@4_M!N89J?F zs?k6eL)z;TS8Z&7fc_ipt~j;{`s zl$omsU0S)We*X2tN&e(?NuFdd;{O932;3+D literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/item/raw_illumenite.png b/src/main/resources/assets/netherrocks/textures/item/raw_illumenite.png new file mode 100644 index 0000000000000000000000000000000000000000..ac12d2e719102ba8ba7f428fe8023d973784be6c GIT binary patch literal 5400 zcmeHKc{r478y}@eDj}p3W0ED!zA$4ZWQ0UwiqP`T%sWiXVrDRu5|U0hIvhn>s6(ab zsMCTH=~K3>Ns-Zl&`67tmhYXR?fT9?UDtR1Yv!7n_r0Ir{k!k`_uS9(%)7_a!+Dm5 zp#}^Fo8{_4_kw=46d(2J(6{l+PXG+2`YDRxEAav%;6jmr!wmu9l1L#42c=vN3?{vI z#>YQn&_eTl;JkCH@vuElo>Tken=|ZoRmeS>T}$$dqM2ux(sPy=VLx=+U4I`}OHTQZ zTGIjM`Ageg+yWV`g;vI^i$6-``dioWhkD=1HZ#-9HWK-tT0BP0w87TOe0#q)yG7$B zV+%J8Pr1DIIh`=bQ(I}PRr-2ocuZLW$nqMa#y9(PH0u4VF8&pyu-!(V24H8`J3^nX6{ zL~W>f=a!=nG-?i>xgaY{zqvER;jkfS*!o+s*EITYiB5XMS}h{4=Hc%JA+w|}Ugq`0 z>sVv@FU4+5Xxrf1-*3IJYps{0Q~hv?R#IbS=GfZ>Z(8hGt8VG6zap9z!1vI&cA&1_ zyv$xb+1t6t<#}ZHrZk`FaXl{Qm@yq0^Kw=1-OHjpj0;L&*Vig>jUmSCWH zSAE3W)T&{|+!rTg=8IC9&6lQVSg5wgG)MNTi(2ciHm&G?9#(7gBR6Hl1lsu>^#G1d^X2(;y%C$AIXmM2(0`cNbln~OPK zZ>$gC(@M}GlE0-JRlj<{`=yN*W%kK_@3o@! zgMx?!%d*;m51Slcd7BRJ&U>BjvT4zjK3k)~qx)g?r{9jrS61(HI~%E5`Lw`npsitm zdW35Em;ci>v#zrVXWz-R{zR%-T$!__?1STUkBjAzL(|j}A`@+_?3Qx-Ft3wusRr65 zq+zpH3k8i=9k{cLVve;HM~%;u>kDft8_(|T&kwMRr_Evv%CDW&wF)a;dD|$;5#C{9 zyY6N}oMV^tFL`SrdcEU1)Z3!w`t4R0_iG#7leU%}J}ByY zeKIKqKO+>)D`$Y-)QVk z`r9X_enAy%Tf>PtviaABqwCsR&dLwpySC+1NTGcGq0s(gAt_N8J7M*uI&Wo0OYV%) z3QvX0Zl2xqG;UDH!`~)){Ou0jN0#=1Nd;?-?{2924S9v(G&qViZUEfY=n!dV#LiSd zhijKvgBrH#X3LS>_^UfJ<2wwNa$}?}kKEkRvM!7t@B~PauL6g* zaf@`i?)X2bn?Ha2si+!}OnuZ}oSz_bGBW)LYb;xT$KUUn+cX+)=r2xL*U8GVgEO;7 z)w3R%&C$MmVU{@mk9_YZ-1vppwz=`pP8W2Uhh6F2L-aR)Ms}V;C3meHa_0^Sa)z4A z?mCsv;F(~{6N=ql?pUyWuKK43E8KeRZqLLxpP6HJ3kiK|*)lmc5K$>fjGkb13Vz=7pv&(W_X_wK_krS@hJHfHk#5rNjnTR2;c+DsJz& z!r6tf@V8SR_Vym{M=ajHU)QfnS{*uPIC{9YDs+VWE*T+@ z9B|b)-Tt`b;mCr%-)pDb)~yeTO7S(#Sh?`D1Y>p3a6~th(I%>?#Bn@6O&Z+_R%%8bz40h=8>4^2ao%@v_y7R+dY2g{n+c~T9rlBRMJt0@DH*b z&r2_^3l&wm{aUqCu3tT7pt8Kw{+!&VyE>(XsuFwq+8+-_1%#N))y;!EWR&VF!BqWr zo_ohsR76aLxg!bm(P-BG)k*dt>8j-%&CV%T3O088_1Q$jidzf*Tp*Ka86ek;X5B8m zekgkUVqROh@!||o;(ela0CZ#-aG|5g*L@X*CE%d|wtxwuq&y*XbirU$JE;(01%nbe z6Aa|?X^7#{as-^qrXhTY?ihEWBN)VWi4uX{Q63CdR4|LoM%XRWph_ta0S}Y_a49c@ zFQ!Oo2qiBCx>lIc2)Gg=38o=@-96!s0ucx&pa>`o(n-n<$03$!z^NiOhvG$FF-Za4 z(GWoriI9RuM?^%RBJe1IC=iV$lgVfd4voVhAp}w!$(I09BwxHpK{3HW2gNKAS192M z_;3X$z!Zc@Xb1!}4*#4VPw4Lcg`O{-Q~}ZhEd_*VEDD3>@zCFTh$T+p5Xodh|L7rR zKqoxf3ls~&L@dxL9OO$DeM`Y+eeoBDi9(d+uvus@1mr>$NhFg=0Ex^dKsVn|x$?ylfX@OIR1i6e3-OSN zL@W+uV~`+$3{hA!IY@v=;2>EfYciV&V2L0Z_=aM&hzoTk5b|wS3Mw{4#lnMlHlA#Q z1PCNNk^qv4NE|5QumHG@V=?5D21${6OV^LU4+Mrz;JC zLro;Ew0MR95)R}5tpP5dEr<|*1v9uj&|3m1^u&^IWC9sSAV9(JL;~?EXdNgLL%pbA z#bQu6f^tMLF%+mANLoPAsSttE4pl>O6oG(5AYupvAvA;{1-Qaf+2C;M#I(3@#SkJ= z(esmC?+u1d+)XTk5Uz3v4p%lV1z=4C5d+~MTNw!Qn;2pR0sKG^TH%u|_1Vt-hv~8g zSVRm7utwrI003!>Cn1?kCV&J0yp3YEaUAA^a9`NP0*)jC5P=SXP^C~cPzx!mfm=+9 zY59FN5ka6rDGUya#MmHl7zUO|Ay`vzcm#T~ShQkIf3B8_{vSQ4O29Xp0OU7egEkjv zuR?#>tS0qRNcb#dTtB414}pJn*H5{ANP!;$|Lm^+n_L=S zA9p}L^baTkdYHMTYT5uj2u)|YIn!aE6z`)~^3x#8457<B8Is;(O0Ae^e2 zYcbpY)X0r_?XOHM?n~5lojKuVnbG6VR%^?;-L8-%8EYyY=TcN88LOHj^2t*=daW2u z>zQRL!!PBc`nmQq*#0|T8TRGqRmH|`ezkMN&rd$~-pg$q!RUppG9{p=60f*e_HYKi_6Q8Ko!GW MojmA;%QwgV7j1oH4FCWD literal 0 HcmV?d00001 From feedc76ecb4cecbc9b0d31a4030811c7e9f3a40d Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 21 Aug 2021 11:30:22 -0500 Subject: [PATCH 08/56] updated simplecorelib version, mods.toml, some work done on oregen, requires new simplecorelib --- gradle.properties | 2 +- .../netherrocks/generation/OreGeneration.java | 91 +++++++++++-------- src/main/resources/META-INF/mods.toml | 34 +++---- 3 files changed, 69 insertions(+), 58 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0688674c..e133de83 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ version_forge = 1.17.1-37.0.40 # Simple Ores: Netherrocks version_mod = 3.0.0 -simplecorelib_version = 1.17.1-3.0.0.6 +simplecorelib_version = 1.17.1-3.0.0.7 simpleores_version = 1.17.1-3.0.0.1 version_mcjei = 1.16.5 jei_version = 7.6.4.90 diff --git a/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java b/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java index 76f9629d..7497035a 100644 --- a/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java +++ b/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java @@ -1,65 +1,50 @@ package mod.alexndr.netherrocks.generation; +import com.google.common.collect.ImmutableList; + import mod.alexndr.netherrocks.Netherrocks; import mod.alexndr.netherrocks.config.NetherrocksConfig; import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.simplecorelib.world.OreGenUtils; +import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.configurations.CountConfiguration; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; import net.minecraft.world.level.levelgen.placement.FeatureDecorator; +import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest; +import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraftforge.event.world.BiomeLoadingEvent; -import net.minecraftforge.fml.RegistryObject; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; /** * Ore generation master-class for Netherrocks. */ public class OreGeneration { + public static final RuleTest MAGMAROCK_TEST = new BlockMatchTest(Blocks.MAGMA_BLOCK); + public static final RuleTest GLOWSTONE_TEST = new BlockMatchTest(Blocks.GLOWSTONE); + + public static final ImmutableList ORE_FYRITE_TARGET_LIST = ImmutableList.of( + OreConfiguration.target(MAGMAROCK_TEST, ModBlocks.fyrite_ore.get().defaultBlockState())); + public static ConfiguredFeature ORE_ARGONITE; public static ConfiguredFeature ORE_ASHSTONE; public static ConfiguredFeature ORE_DRAGONSTONE; public static ConfiguredFeature ORE_FYRITE; + public static ConfiguredFeature ORE_FYRITE_ROCK; public static ConfiguredFeature ORE_ILLUMENITE; public static ConfiguredFeature ORE_ILLUMENITE_EXTRA; public static ConfiguredFeature ORE_MALACHITE; - public static final DeferredRegister> FEATURES = - DeferredRegister.create(ForgeRegistries.FEATURES, Netherrocks.MODID); - - public static final RegistryObject> ILLUMENITE_FEATURE = - FEATURES.register("illumenite_blob", - () -> new IllumeniteBlobFeature(NoneFeatureConfiguration.CODEC)); +// public static final DeferredRegister> FEATURES = +// DeferredRegister.create(ForgeRegistries.FEATURES, Netherrocks.MODID); +// +// public static final RegistryObject> ILLUMENITE_FEATURE = +// FEATURES.register("illumenite_blob", +// () -> new IllumeniteBlobFeature(NoneFeatureConfiguration.CODEC)); - /** - * generate nether ores. - */ - public static void generateNetherOres(BiomeLoadingEvent evt) - { - if (NetherrocksConfig.enableArgoniteOre) - evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ARGONITE); - if (NetherrocksConfig.enableAshstoneOre) - evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ASHSTONE); - if (NetherrocksConfig.enableDragonstoneOre) - evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_DRAGONSTONE); - if (NetherrocksConfig.enableFyriteOre) - evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_FYRITE); - if (NetherrocksConfig.enableMalachiteOre) - evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_MALACHITE); - - if (NetherrocksConfig.enableIllumeniteOre) - { - evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ILLUMENITE); - evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ILLUMENITE_EXTRA); - } - } // end generateNetherOres() - - /** + /** * initialize nether Features. * * @param evt @@ -68,27 +53,29 @@ public static void initNetherFeatures() { if (NetherrocksConfig.enableArgoniteOre) { - ORE_ARGONITE = OreGenUtils.buildNetherOreFeature(Feature.ORE, ModBlocks.argonite_ore.get().defaultBlockState(), + ORE_ARGONITE = OreGenUtils.buildNetherRockFeature(ModBlocks.argonite_ore.get().defaultBlockState(), NetherrocksConfig.argonite_cfg); OreGenUtils.registerFeature(Netherrocks.MODID, "argonite_vein", ORE_ARGONITE); } if (NetherrocksConfig.enableAshstoneOre) { - ORE_ASHSTONE = OreGenUtils.buildNetherOreFeature(Feature.ORE, ModBlocks.ashstone_ore.get().defaultBlockState(), + ORE_ASHSTONE = OreGenUtils.buildNetherRockFeature(ModBlocks.ashstone_ore.get().defaultBlockState(), NetherrocksConfig.ashstone_cfg); OreGenUtils.registerFeature(Netherrocks.MODID, "ashstone_vein", ORE_ASHSTONE); } if (NetherrocksConfig.enableDragonstoneOre) { - ORE_DRAGONSTONE = OreGenUtils.buildNetherOreFeature(Feature.ORE, ModBlocks.dragonstone_ore.get().defaultBlockState(), + ORE_DRAGONSTONE = OreGenUtils.buildNetherRockFeature(ModBlocks.dragonstone_ore.get().defaultBlockState(), NetherrocksConfig.dragonstone_cfg); OreGenUtils.registerFeature(Netherrocks.MODID, "dragonstone_vein", ORE_DRAGONSTONE); } if (NetherrocksConfig.enableFyriteOre) { - ORE_FYRITE = OreGenUtils.buildNetherOreFeature(Feature.ORE, ModBlocks.fyrite_ore.get().defaultBlockState(), + ORE_FYRITE = OreGenUtils.buildNetherOreFeature(ModBlocks.fyrite_ore.get().defaultBlockState(), NetherrocksConfig.fyrite_cfg); + ORE_FYRITE_ROCK = OreGenUtils.buildTargettedOreFeature(ORE_FYRITE_TARGET_LIST, NetherrocksConfig.fyrite_cfg); OreGenUtils.registerFeature(Netherrocks.MODID, "fyrite_vein", ORE_FYRITE); + OreGenUtils.registerFeature(Netherrocks.MODID, "fyrite_in_magma", ORE_FYRITE_ROCK); } // Illumenite ore is a special snowflake that generates in glowstone blobs, so it has // to mimic glowstone generation. A side-effect is that more glowstone generates as well. @@ -105,10 +92,34 @@ public static void initNetherFeatures() } if (NetherrocksConfig.enableMalachiteOre) { - ORE_MALACHITE = OreGenUtils.buildNetherOreFeature(Feature.ORE, ModBlocks.malachite_ore.get().defaultBlockState(), + ORE_MALACHITE = OreGenUtils.buildNetherRockFeature(ModBlocks.malachite_ore.get().defaultBlockState(), NetherrocksConfig.malachite_cfg); OreGenUtils.registerFeature(Netherrocks.MODID, "malachite_vein", ORE_MALACHITE); } } // end-initNetherFeatures() + + /** + * generate nether ores. + */ + public static void generateNetherOres(BiomeLoadingEvent evt) + { + if (NetherrocksConfig.enableArgoniteOre) + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ARGONITE); + if (NetherrocksConfig.enableAshstoneOre) + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ASHSTONE); + if (NetherrocksConfig.enableDragonstoneOre) + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_DRAGONSTONE); + if (NetherrocksConfig.enableFyriteOre) + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_FYRITE); + if (NetherrocksConfig.enableMalachiteOre) + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_MALACHITE); + + if (NetherrocksConfig.enableIllumeniteOre) + { + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ILLUMENITE); + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ILLUMENITE_EXTRA); + } + } // end generateNetherOres() + } // end class OreGeneration diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 4d567991..c81dc86f 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -3,7 +3,7 @@ modLoader="javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="[36,)" #mandatory +loaderVersion="[37,)" #mandatory issueTrackerURL="https://github.com/Sinhika/Netherrocks/issues" license="LGPL 3.0" logoFile="netherrocks.png" @@ -25,34 +25,34 @@ Additional Credits: AzazEL3095 (Spanish translation) [[dependencies.netherrocks]] #optional modId="forge" mandatory=true - versionRange="[36.1.0,)" + versionRange="[37.0.31,)" ordering="NONE" side="BOTH" [[dependencies.netherrocks]] modId="minecraft" mandatory=true - versionRange="[1.16.5,1.17)" + versionRange="[1.17.1,1.18)" ordering="NONE" side="BOTH" [[dependencies.netherrocks]] modId="simplecorelib" mandatory=true - versionRange="[1.16.5-2.0.8.22,1.16.5-2.0.9.0)" + versionRange="[1.17.1-3.0.0.7,1.17.1-3.1.0.0)" ordering="NONE" side="BOTH" -[[dependencies.netherrocks]] - modId="silents_mechanisms" - mandatory=false - versionRange="[0.8.9,)" - ordering="BEFORE" - side="BOTH" - -[[dependencies.netherrocks]] - modId="silentgear" - mandatory=false - versionRange="[2.5.2,)" - ordering="BEFORE" - side="BOTH" +# [[dependencies.netherrocks]] +# modId="silents_mechanisms" +# mandatory=false +# versionRange="[0.8.9,)" +# ordering="BEFORE" +# side="BOTH" +# +# [[dependencies.netherrocks]] +# modId="silentgear" +# mandatory=false +# versionRange="[2.5.2,)" +# ordering="BEFORE" +# side="BOTH" From 0e621d3b1a42d769b9bb075251a812f213afc3f8 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 21 Aug 2021 14:56:46 -0500 Subject: [PATCH 09/56] Ore generation compiles, at least. Noted which values are just ignored in config. Updated FyriteHander.onUseItem() to behave like flint&steel. --- .../netherrocks/config/ConfigHelper.java | 58 ++++++------- .../netherrocks/config/ServerConfig.java | 36 ++++---- .../netherrocks/datagen/SilentsRecipes.java | 2 +- .../generation/IllumeniteBlobFeature.java | 27 +++--- .../netherrocks/generation/OreGeneration.java | 42 +++++---- .../netherrocks/helpers/FyriteHandler.java | 87 ++++++++++--------- 6 files changed, 136 insertions(+), 116 deletions(-) diff --git a/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java b/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java index 73ac5d52..74ad5543 100644 --- a/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java +++ b/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java @@ -1,6 +1,7 @@ package mod.alexndr.netherrocks.config; import mod.alexndr.simplecorelib.config.ModOreConfig; +import net.minecraft.world.level.levelgen.VerticalAnchor; import net.minecraft.world.level.levelgen.feature.configurations.RangeDecoratorConfiguration; import net.minecraftforge.fml.config.ModConfig; @@ -20,46 +21,41 @@ public static void bakeServer(final ModConfig config) NetherrocksConfig.addModLootToChests = ConfigHolder.SERVER.serverAddModLootToChests.get(); NetherrocksConfig.enableArgoniteOre = ConfigHolder.SERVER.serverEnableArgoniteOre.get(); - NetherrocksConfig.argonite_cfg = new ModOreConfig( - new RangeDecoratorConfiguration(ConfigHolder.SERVER.serverArgoniteBottomHeight.get(), - 0, ConfigHolder.SERVER.serverArgoniteMaxHeight.get()), - ConfigHolder.SERVER.serverArgoniteVeinSize.get(), - ConfigHolder.SERVER.serverArgoniteVeinCount.get()); + NetherrocksConfig.argonite_cfg = new ModOreConfig(ModOreConfig.FULL_RANGE, + ConfigHolder.SERVER.serverArgoniteVeinSize.get(), ConfigHolder.SERVER.serverArgoniteVeinCount.get(), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverArgoniteBottomHeight.get()), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverArgoniteMaxHeight.get())); + NetherrocksConfig.enableAshstoneOre = ConfigHolder.SERVER.serverEnableAshstoneOre.get(); - NetherrocksConfig.ashstone_cfg = new ModOreConfig( - new RangeDecoratorConfiguration(ConfigHolder.SERVER.serverAshstoneBottomHeight.get(), - 0, ConfigHolder.SERVER.serverAshstoneMaxHeight.get()), - ConfigHolder.SERVER.serverAshstoneVeinSize.get(), - ConfigHolder.SERVER.serverAshstoneVeinCount.get()); - + NetherrocksConfig.ashstone_cfg = new ModOreConfig(ModOreConfig.FULL_RANGE, + ConfigHolder.SERVER.serverAshstoneVeinSize.get(), ConfigHolder.SERVER.serverAshstoneVeinCount.get(), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverAshstoneBottomHeight.get()), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverAshstoneMaxHeight.get())); + NetherrocksConfig.enableDragonstoneOre = ConfigHolder.SERVER.serverEnableDragonstoneOre.get(); - NetherrocksConfig.dragonstone_cfg = new ModOreConfig( - new RangeDecoratorConfiguration(ConfigHolder.SERVER.serverDragonstoneBottomHeight.get(), - 0, ConfigHolder.SERVER.serverDragonstoneMaxHeight.get()), - ConfigHolder.SERVER.serverDragonstoneVeinSize.get(), - ConfigHolder.SERVER.serverDragonstoneVeinCount.get()); + NetherrocksConfig.dragonstone_cfg = new ModOreConfig(ModOreConfig.FULL_RANGE, + ConfigHolder.SERVER.serverDragonstoneVeinSize.get(), ConfigHolder.SERVER.serverDragonstoneVeinCount.get(), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverDragonstoneBottomHeight.get()), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverDragonstoneMaxHeight.get())); NetherrocksConfig.enableFyriteOre = ConfigHolder.SERVER.serverEnableFyriteOre.get(); - NetherrocksConfig.fyrite_cfg = new ModOreConfig( - new RangeDecoratorConfiguration(ConfigHolder.SERVER.serverFyriteBottomHeight.get(), - 0, ConfigHolder.SERVER.serverFyriteMaxHeight.get() ), - ConfigHolder.SERVER.serverFyriteVeinSize.get(), - ConfigHolder.SERVER.serverFyriteVeinCount.get()); + NetherrocksConfig.fyrite_cfg = new ModOreConfig(ModOreConfig.FULL_RANGE, + ConfigHolder.SERVER.serverFyriteVeinSize.get(), ConfigHolder.SERVER.serverFyriteVeinCount.get(), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverFyriteBottomHeight.get()), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverFyriteMaxHeight.get())); NetherrocksConfig.enableIllumeniteOre = ConfigHolder.SERVER.serverEnableIllumeniteOre.get(); - NetherrocksConfig.illumenite_cfg = new ModOreConfig( - new RangeDecoratorConfiguration(ConfigHolder.SERVER.serverIllumeniteBottomHeight.get(), - 0, ConfigHolder.SERVER.serverIllumeniteMaxHeight.get()), - ConfigHolder.SERVER.serverIllumeniteVeinSize.get(), - ConfigHolder.SERVER.serverIllumeniteVeinCount.get()); + NetherrocksConfig.illumenite_cfg = new ModOreConfig(ModOreConfig.FULL_RANGE, + ConfigHolder.SERVER.serverIllumeniteVeinSize.get(), ConfigHolder.SERVER.serverIllumeniteVeinCount.get(), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverIllumeniteBottomHeight.get()), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverIllumeniteMaxHeight.get())); NetherrocksConfig.enableMalachiteOre = ConfigHolder.SERVER.serverEnableMalachiteOre.get(); - NetherrocksConfig.malachite_cfg = new ModOreConfig( - new RangeDecoratorConfiguration(ConfigHolder.SERVER.serverMalachiteBottomHeight.get(), - 0, ConfigHolder.SERVER.serverMalachiteMaxHeight.get()), - ConfigHolder.SERVER.serverMalachiteVeinSize.get(), - ConfigHolder.SERVER.serverMalachiteVeinCount.get()); + NetherrocksConfig.malachite_cfg = new ModOreConfig(ModOreConfig.FULL_RANGE, + ConfigHolder.SERVER.serverMalachiteVeinSize.get(),ConfigHolder.SERVER.serverMalachiteVeinCount.get(), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverMalachiteBottomHeight.get()), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverMalachiteMaxHeight.get())); } // end bakeServer() @SuppressWarnings("unused") diff --git a/src/main/java/mod/alexndr/netherrocks/config/ServerConfig.java b/src/main/java/mod/alexndr/netherrocks/config/ServerConfig.java index 652a3223..e1b10c3e 100644 --- a/src/main/java/mod/alexndr/netherrocks/config/ServerConfig.java +++ b/src/main/java/mod/alexndr/netherrocks/config/ServerConfig.java @@ -95,11 +95,11 @@ final class ServerConfig .translation(Netherrocks.MODID + ".config.serverArgoniteVeinCount") .defineInRange("ArgoniteVeinCount", 10, 1, Integer.MAX_VALUE); serverArgoniteBottomHeight = builder - .comment("Argonite ore minimum height") + .comment("Argonite ore minimum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverArgoniteBottomHeight") - .defineInRange("ArgoniteBottomHeight", 0, 1, 128); + .defineInRange("ArgoniteBottomHeight", 1, 1, 128); serverArgoniteMaxHeight = builder - .comment("Argonite ore maximum height") + .comment("Argonite ore maximum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverArgoniteMaxHeight") .defineInRange("ArgoniteMaxHeight", 128, 1, 128); builder.pop(); @@ -114,11 +114,11 @@ final class ServerConfig .translation(Netherrocks.MODID + ".config.serverAshstoneVeinCount") .defineInRange("AshstoneVeinCount", 10, 1, Integer.MAX_VALUE); serverAshstoneBottomHeight = builder - .comment("Ashstone ore minimum height") + .comment("Ashstone ore minimum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverAshstoneBottomHeight") - .defineInRange("AshstoneBottomHeight", 0, 1, 127); + .defineInRange("AshstoneBottomHeight", 1, 1, 127); serverAshstoneMaxHeight = builder - .comment("Ashstone ore maximum height") + .comment("Ashstone ore maximum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverAshstoneMaxHeight") .defineInRange("AshstoneMaxHeight", 128, 1, 128); builder.pop(); @@ -133,11 +133,11 @@ final class ServerConfig .translation(Netherrocks.MODID + ".config.serverDragonstoneVeinCount") .defineInRange("DragonstoneVeinCount", 7, 1, Integer.MAX_VALUE); serverDragonstoneBottomHeight = builder - .comment("Dragonstone ore minimum height") + .comment("Dragonstone ore minimum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverDragonstoneBottomHeight") - .defineInRange("DragonstoneBottomHeight", 0, 1, 127); + .defineInRange("DragonstoneBottomHeight", 1, 1, 127); serverDragonstoneMaxHeight = builder - .comment("Dragonstone ore maximum height") + .comment("Dragonstone ore maximum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverDragonstoneMaxHeight") .defineInRange("DragonstoneMaxHeight", 128, 1, 128); builder.pop(); @@ -152,11 +152,11 @@ final class ServerConfig .translation(Netherrocks.MODID + ".config.serverFyriteVeinCount") .defineInRange("FyriteVeinCount", 10, 1, Integer.MAX_VALUE); serverFyriteBottomHeight = builder - .comment("Fyrite ore minimum height") + .comment("Fyrite ore minimum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverFyriteBottomHeight") - .defineInRange("FyriteBottomHeight", 0, 1, 127); + .defineInRange("FyriteBottomHeight", 1, 1, 127); serverFyriteMaxHeight = builder - .comment("Fyrite ore maximum height") + .comment("Fyrite ore maximum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverFyriteMaxHeight") .defineInRange("FyriteMaxHeight", 128, 1, 128); builder.pop(); @@ -171,11 +171,11 @@ final class ServerConfig .translation(Netherrocks.MODID + ".config.serverIllumeniteVeinCount") .defineInRange("IllumeniteVeinCount", 5, 1, Integer.MAX_VALUE); serverIllumeniteBottomHeight = builder - .comment("Illumenite ore minimum height") + .comment("Illumenite ore minimum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverIllumeniteBottomHeight") - .defineInRange("IllumeniteBottomHeight", 0, 1, 127); + .defineInRange("IllumeniteBottomHeight", 1, 1, 127); serverIllumeniteMaxHeight = builder - .comment("Illumenite ore maximum height") + .comment("Illumenite ore maximum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverIllumeniteMaxHeight") .defineInRange("IllumeniteMaxHeight", 128, 1, 128); builder.pop(); @@ -190,11 +190,11 @@ final class ServerConfig .translation(Netherrocks.MODID + ".config.serverMalachiteVeinCount") .defineInRange("MalachiteVeinCount", 10, 1, Integer.MAX_VALUE); serverMalachiteBottomHeight = builder - .comment("Malachite ore minimum height") + .comment("Malachite ore minimum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverMalachiteBottomHeight") - .defineInRange("MalachiteBottomHeight", 0, 0, 127); + .defineInRange("MalachiteBottomHeight", 1, 1, 127); serverMalachiteMaxHeight = builder - .comment("Malachite ore maximum height") + .comment("Malachite ore maximum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverMalachiteMaxHeight") .defineInRange("MalachiteMaxHeight", 128, 1, 128); builder.pop(); diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/SilentsRecipes.java b/src/main/java/mod/alexndr/netherrocks/datagen/SilentsRecipes.java index 117f68ae..5f1936ec 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/SilentsRecipes.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/SilentsRecipes.java @@ -25,7 +25,7 @@ public SilentsRecipes(DataGenerator generatorIn) } @Override - protected void buildShapelessRecipes(Consumer consumer) + protected void buildCraftingRecipes(Consumer consumer) { registerFurnaceRecipes(consumer); } // end registerRecipes() diff --git a/src/main/java/mod/alexndr/netherrocks/generation/IllumeniteBlobFeature.java b/src/main/java/mod/alexndr/netherrocks/generation/IllumeniteBlobFeature.java index 898aa6ef..e2c670a9 100644 --- a/src/main/java/mod/alexndr/netherrocks/generation/IllumeniteBlobFeature.java +++ b/src/main/java/mod/alexndr/netherrocks/generation/IllumeniteBlobFeature.java @@ -5,21 +5,21 @@ import com.mojang.serialization.Codec; import mod.alexndr.netherrocks.init.ModBlocks; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.core.Direction; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkGenerator; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; public class IllumeniteBlobFeature extends Feature { - public IllumeniteBlobFeature(Codec p_i231956_1_) + public IllumeniteBlobFeature(Codec codec) { - super(p_i231956_1_); + super(codec); } /** @@ -33,9 +33,12 @@ public IllumeniteBlobFeature(Codec p_i231956_1_) * @return */ @Override - public boolean place(WorldGenLevel worldIn, - ChunkGenerator generator, Random rand, BlockPos pos, NoneFeatureConfiguration config) + public boolean place(FeaturePlaceContext context) { + WorldGenLevel worldIn = context.level(); + BlockPos pos = context.origin(); + Random rand = context.random(); + if (!worldIn.isEmptyBlock(pos)) { return false; } @@ -53,14 +56,14 @@ public boolean place(WorldGenLevel worldIn, { BlockPos blockpos = pos.offset(rand.nextInt(8) - rand.nextInt(8), -rand.nextInt(12), rand.nextInt(8) - rand.nextInt(8)); BlockState bstate = worldIn.getBlockState(blockpos); - if (bstate.getBlock().isAir(bstate, worldIn, blockpos)) + if (bstate.isAir()) { int j = 0; for(Direction direction : Direction.values()) { - Block thatblock = worldIn.getBlockState(blockpos.relative(direction)).getBlock(); - if (thatblock == Blocks.GLOWSTONE || thatblock == ModBlocks.illumenite_ore.get()) + BlockState thatblock = worldIn.getBlockState(blockpos.relative(direction)); + if (thatblock.is(Blocks.GLOWSTONE) || thatblock.is(ModBlocks.illumenite_ore.get())) { ++j; } diff --git a/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java b/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java index 7497035a..8bc5cfa0 100644 --- a/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java +++ b/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java @@ -6,16 +6,21 @@ import mod.alexndr.netherrocks.config.NetherrocksConfig; import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.simplecorelib.world.OreGenUtils; +import net.minecraft.data.worldgen.Features; +import net.minecraft.util.valueproviders.BiasedToBottomInt; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.configurations.CountConfiguration; +import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; +import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import net.minecraft.world.level.levelgen.placement.FeatureDecorator; import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest; import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraftforge.event.world.BiomeLoadingEvent; +import net.minecraftforge.fmllegacy.RegistryObject; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; /** * Ore generation master-class for Netherrocks. @@ -24,10 +29,15 @@ public class OreGeneration { public static final RuleTest MAGMAROCK_TEST = new BlockMatchTest(Blocks.MAGMA_BLOCK); public static final RuleTest GLOWSTONE_TEST = new BlockMatchTest(Blocks.GLOWSTONE); + public static final RuleTest BLACKSTONE_TEST = new BlockMatchTest(Blocks.BLACKSTONE); public static final ImmutableList ORE_FYRITE_TARGET_LIST = ImmutableList.of( OreConfiguration.target(MAGMAROCK_TEST, ModBlocks.fyrite_ore.get().defaultBlockState())); + public static final ImmutableList ORE_DRAGONSTONE_TARGET_LIST = ImmutableList.of( + OreConfiguration.target(BLACKSTONE_TEST, ModBlocks.dragonstone_ore.get().defaultBlockState()), + OreConfiguration.target(OreConfiguration.Predicates.NETHERRACK, ModBlocks.dragonstone_ore.get().defaultBlockState())); + public static ConfiguredFeature ORE_ARGONITE; public static ConfiguredFeature ORE_ASHSTONE; public static ConfiguredFeature ORE_DRAGONSTONE; @@ -37,19 +47,19 @@ public class OreGeneration public static ConfiguredFeature ORE_ILLUMENITE_EXTRA; public static ConfiguredFeature ORE_MALACHITE; -// public static final DeferredRegister> FEATURES = -// DeferredRegister.create(ForgeRegistries.FEATURES, Netherrocks.MODID); -// -// public static final RegistryObject> ILLUMENITE_FEATURE = -// FEATURES.register("illumenite_blob", -// () -> new IllumeniteBlobFeature(NoneFeatureConfiguration.CODEC)); + public static final DeferredRegister> FEATURES = + DeferredRegister.create(ForgeRegistries.FEATURES, Netherrocks.MODID); + + public static final RegistryObject> ILLUMENITE_FEATURE = + FEATURES.register("illumenite_blob", () -> new IllumeniteBlobFeature(NoneFeatureConfiguration.CODEC)); /** * initialize nether Features. * * @param evt */ - public static void initNetherFeatures() + @SuppressWarnings("deprecation") + public static void initNetherFeatures() { if (NetherrocksConfig.enableArgoniteOre) { @@ -65,8 +75,7 @@ public static void initNetherFeatures() } if (NetherrocksConfig.enableDragonstoneOre) { - ORE_DRAGONSTONE = OreGenUtils.buildNetherRockFeature(ModBlocks.dragonstone_ore.get().defaultBlockState(), - NetherrocksConfig.dragonstone_cfg); + ORE_DRAGONSTONE = OreGenUtils.buildTargettedOreFeature(ORE_DRAGONSTONE_TARGET_LIST, NetherrocksConfig.dragonstone_cfg); OreGenUtils.registerFeature(Netherrocks.MODID, "dragonstone_vein", ORE_DRAGONSTONE); } if (NetherrocksConfig.enableFyriteOre) @@ -82,10 +91,11 @@ public static void initNetherFeatures() if (NetherrocksConfig.enableIllumeniteOre) { ORE_ILLUMENITE = ILLUMENITE_FEATURE.get().configured(FeatureConfiguration.NONE) - .range(NetherrocksConfig.illumenite_cfg.getCfg().maximum).squared() - .count(NetherrocksConfig.illumenite_cfg.getVein_count()); + .range(Features.Decorators.FULL_RANGE).squared().count(NetherrocksConfig.illumenite_cfg.getVein_count()); + ORE_ILLUMENITE_EXTRA = ILLUMENITE_FEATURE.get().configured(FeatureConfiguration.NONE) - .decorated(FeatureDecorator.GLOWSTONE.configured(new CountConfiguration(10))); + .range(Features.Decorators.RANGE_4_4).squared().count(BiasedToBottomInt.of(0, 9)); + OreGenUtils.registerFeature(Netherrocks.MODID, "illumenite_cluster", ORE_ILLUMENITE); OreGenUtils.registerFeature(Netherrocks.MODID, "illumenite_cluster_extra", ORE_ILLUMENITE_EXTRA); @@ -110,8 +120,10 @@ public static void generateNetherOres(BiomeLoadingEvent evt) evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ASHSTONE); if (NetherrocksConfig.enableDragonstoneOre) evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_DRAGONSTONE); - if (NetherrocksConfig.enableFyriteOre) + if (NetherrocksConfig.enableFyriteOre) { evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_FYRITE); + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_FYRITE_ROCK); + } if (NetherrocksConfig.enableMalachiteOre) evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_MALACHITE); diff --git a/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java b/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java index 3cc888b7..5ca1135a 100644 --- a/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java +++ b/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java @@ -4,17 +4,25 @@ import mod.alexndr.netherrocks.Netherrocks; import mod.alexndr.simplecorelib.helpers.IWeaponEffectHelper; -import net.minecraft.world.level.block.Blocks; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.world.InteractionResult; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; -import net.minecraftforge.common.extensions.IForgeBlockState; +import net.minecraft.world.level.block.BaseFireBlock; +import net.minecraft.world.level.block.CampfireBlock; +import net.minecraft.world.level.block.CandleBlock; +import net.minecraft.world.level.block.CandleCakeBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.gameevent.GameEvent; public class FyriteHandler implements IWeaponEffectHelper { @@ -57,50 +65,51 @@ public void afterBlockSmelt(Level world, BlockPos pos, boolean was_effective) public InteractionResult onItemUse(UseOnContext context) { - BlockPos adjacentPos = context.getClickedPos(); BlockPos pos = context.getClickedPos(); ItemStack stack = context.getItemInHand(); Player playerIn = context.getPlayer(); Level worldIn = context.getLevel(); - + BlockState blockstate = worldIn.getBlockState(pos); + if (stack.isEmpty()) { - return InteractionResult.PASS; + return InteractionResult.FAIL; } - switch (context.getClickedFace()) - { - case DOWN: - adjacentPos = pos.below(); - break; - case UP: - adjacentPos = pos.above(); - break; - case NORTH: - adjacentPos = pos.north(); - break; - case SOUTH: - adjacentPos = pos.south(); - break; - case EAST: - adjacentPos = pos.east(); - break; - case WEST: - adjacentPos = pos.west(); - break; - } // end switch + BlockPos adjacentPos = pos.relative(context.getClickedFace()); + if (!playerIn.mayUseItemAt(adjacentPos, context.getClickedFace(), stack)) { - return InteractionResult.PASS; + return InteractionResult.FAIL; } - IForgeBlockState targetBlock = worldIn.getBlockState(adjacentPos); - if (targetBlock.isAir(targetBlock.getBlockState(), worldIn, adjacentPos)) + if (!CampfireBlock.canLight(blockstate) && !CandleBlock.canLight(blockstate) && !CandleCakeBlock.canLight(blockstate)) { - if (worldIn.isClientSide) { - playerIn.playSound(SoundEvents.FIRE_AMBIENT, 1.0F, 1.0F); + if (BaseFireBlock.canBePlacedAt(worldIn, adjacentPos, context.getHorizontalDirection())) + { + worldIn.playSound(playerIn, adjacentPos, SoundEvents.FIRE_AMBIENT, SoundSource.BLOCKS, 1.0F, 1.0F); + BlockState blockstate1 = BaseFireBlock.getState(worldIn, adjacentPos); + worldIn.setBlock(adjacentPos, blockstate1, 11); + worldIn.gameEvent(playerIn, GameEvent.BLOCK_PLACE, pos); + ItemStack itemstack = context.getItemInHand(); + if (playerIn instanceof ServerPlayer) + { + CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer) playerIn, adjacentPos, itemstack); + itemstack.hurtAndBreak(1, playerIn, (foo) -> { foo.broadcastBreakEvent(context.getHand());} ); + } // end-if ServerPlayer + + return InteractionResult.sidedSuccess(worldIn.isClientSide()); + } // end if can place fire + else { + return InteractionResult.FAIL; + } + } // end-if not campfire, candle, etc. + else { + worldIn.playSound(playerIn, pos, SoundEvents.FLINTANDSTEEL_USE, SoundSource.BLOCKS, 1.0F, worldIn.getRandom().nextFloat() * 0.4F + 0.8F); + worldIn.setBlock(pos, blockstate.setValue(BlockStateProperties.LIT, Boolean.valueOf(true)), 11); + worldIn.gameEvent(playerIn, GameEvent.BLOCK_PLACE, pos); + if (playerIn != null) { + context.getItemInHand().hurtAndBreak(1, playerIn, (foo) -> {foo.broadcastBreakEvent(context.getHand());} ); } - worldIn.setBlockAndUpdate(adjacentPos, Blocks.FIRE.defaultBlockState()); - stack.hurt(1, worldIn.random, null); - } - return InteractionResult.PASS; + return InteractionResult.sidedSuccess(worldIn.isClientSide()); + } } // end onItemUse() } // end class FyriteHandler From 7604ead24b72c499c92a0c1813544938cf3adfba Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 21 Aug 2021 15:03:31 -0500 Subject: [PATCH 10/56] moved Feature registration to own init class --- .../mod/alexndr/netherrocks/Netherrocks.java | 4 ++-- .../netherrocks/config/ConfigHelper.java | 1 - .../netherrocks/generation/OreGeneration.java | 16 +++------------ .../alexndr/netherrocks/init/ModFeatures.java | 20 +++++++++++++++++++ 4 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 src/main/java/mod/alexndr/netherrocks/init/ModFeatures.java diff --git a/src/main/java/mod/alexndr/netherrocks/Netherrocks.java b/src/main/java/mod/alexndr/netherrocks/Netherrocks.java index 0efd5b89..f046c1f1 100644 --- a/src/main/java/mod/alexndr/netherrocks/Netherrocks.java +++ b/src/main/java/mod/alexndr/netherrocks/Netherrocks.java @@ -4,9 +4,9 @@ import org.apache.logging.log4j.Logger; import mod.alexndr.netherrocks.config.ConfigHolder; -import mod.alexndr.netherrocks.generation.OreGeneration; import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModContainers; +import mod.alexndr.netherrocks.init.ModFeatures; import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.netherrocks.init.ModTiles; import net.minecraftforge.eventbus.api.IEventBus; @@ -36,7 +36,7 @@ public Netherrocks() ModItems.ITEMS.register(modEventBus); ModContainers.CONTAINER_TYPES.register(modEventBus); ModTiles.TILE_ENTITY_TYPES.register(modEventBus); - OreGeneration.FEATURES.register(modEventBus); + ModFeatures.FEATURES.register(modEventBus); // Register Configs modLoadingContext.registerConfig(ModConfig.Type.COMMON, ConfigHolder.SERVER_SPEC); diff --git a/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java b/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java index 74ad5543..0c86b0f1 100644 --- a/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java +++ b/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java @@ -2,7 +2,6 @@ import mod.alexndr.simplecorelib.config.ModOreConfig; import net.minecraft.world.level.levelgen.VerticalAnchor; -import net.minecraft.world.level.levelgen.feature.configurations.RangeDecoratorConfiguration; import net.minecraftforge.fml.config.ModConfig; /** diff --git a/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java b/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java index 8bc5cfa0..54c6c59a 100644 --- a/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java +++ b/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java @@ -5,22 +5,18 @@ import mod.alexndr.netherrocks.Netherrocks; import mod.alexndr.netherrocks.config.NetherrocksConfig; import mod.alexndr.netherrocks.init.ModBlocks; +import mod.alexndr.netherrocks.init.ModFeatures; import mod.alexndr.simplecorelib.world.OreGenUtils; import net.minecraft.data.worldgen.Features; import net.minecraft.util.valueproviders.BiasedToBottomInt; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest; import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraftforge.event.world.BiomeLoadingEvent; -import net.minecraftforge.fmllegacy.RegistryObject; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; /** * Ore generation master-class for Netherrocks. @@ -47,12 +43,6 @@ public class OreGeneration public static ConfiguredFeature ORE_ILLUMENITE_EXTRA; public static ConfiguredFeature ORE_MALACHITE; - public static final DeferredRegister> FEATURES = - DeferredRegister.create(ForgeRegistries.FEATURES, Netherrocks.MODID); - - public static final RegistryObject> ILLUMENITE_FEATURE = - FEATURES.register("illumenite_blob", () -> new IllumeniteBlobFeature(NoneFeatureConfiguration.CODEC)); - /** * initialize nether Features. * @@ -90,10 +80,10 @@ public static void initNetherFeatures() // to mimic glowstone generation. A side-effect is that more glowstone generates as well. if (NetherrocksConfig.enableIllumeniteOre) { - ORE_ILLUMENITE = ILLUMENITE_FEATURE.get().configured(FeatureConfiguration.NONE) + ORE_ILLUMENITE = ModFeatures.ILLUMENITE_FEATURE.get().configured(FeatureConfiguration.NONE) .range(Features.Decorators.FULL_RANGE).squared().count(NetherrocksConfig.illumenite_cfg.getVein_count()); - ORE_ILLUMENITE_EXTRA = ILLUMENITE_FEATURE.get().configured(FeatureConfiguration.NONE) + ORE_ILLUMENITE_EXTRA = ModFeatures.ILLUMENITE_FEATURE.get().configured(FeatureConfiguration.NONE) .range(Features.Decorators.RANGE_4_4).squared().count(BiasedToBottomInt.of(0, 9)); OreGenUtils.registerFeature(Netherrocks.MODID, "illumenite_cluster", ORE_ILLUMENITE); diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModFeatures.java b/src/main/java/mod/alexndr/netherrocks/init/ModFeatures.java new file mode 100644 index 00000000..dae64578 --- /dev/null +++ b/src/main/java/mod/alexndr/netherrocks/init/ModFeatures.java @@ -0,0 +1,20 @@ +package mod.alexndr.netherrocks.init; + +import mod.alexndr.netherrocks.Netherrocks; +import mod.alexndr.netherrocks.generation.IllumeniteBlobFeature; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import net.minecraftforge.fmllegacy.RegistryObject; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; + +public final class ModFeatures +{ + public static final DeferredRegister> FEATURES = + DeferredRegister.create(ForgeRegistries.FEATURES, Netherrocks.MODID); + + public static final RegistryObject> ILLUMENITE_FEATURE = + FEATURES.register("illumenite_blob", () -> new IllumeniteBlobFeature(NoneFeatureConfiguration.CODEC)); + + +} // end class From 53194d3f1c7602bb768d505ebc6b71e38b45780a Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 21 Aug 2021 15:11:39 -0500 Subject: [PATCH 11/56] regenerated datagen files; now have mineable tags --- .../tags/blocks/mineable/pickaxe.json | 19 +++++++ .../tags/blocks/needs_diamond_tool.json | 11 ++++ .../tags/blocks/needs_iron_tool.json | 11 ++++ ...onite_ingot_from_blasting_from_chunks.json | 4 +- ...rgonite_ingot_from_blasting_from_dust.json | 4 +- ...onite_ingot_from_smelting_from_chunks.json | 4 +- ...rgonite_ingot_from_smelting_from_dust.json | 4 +- ...yrite_ingot_from_blasting_from_chunks.json | 4 +- .../fyrite_ingot_from_blasting_from_dust.json | 4 +- ...yrite_ingot_from_smelting_from_chunks.json | 4 +- .../fyrite_ingot_from_smelting_from_dust.json | 4 +- ...enite_ingot_from_blasting_from_chunks.json | 4 +- ...umenite_ingot_from_blasting_from_dust.json | 4 +- ...enite_ingot_from_smelting_from_chunks.json | 4 +- ...umenite_ingot_from_smelting_from_dust.json | 4 +- ...chite_ingot_from_blasting_from_chunks.json | 4 +- ...lachite_ingot_from_blasting_from_dust.json | 4 +- ...chite_ingot_from_smelting_from_chunks.json | 4 +- ...lachite_ingot_from_smelting_from_dust.json | 4 +- .../loot_tables/blocks/argonite_block.json | 6 ++- .../loot_tables/blocks/argonite_ore.json | 6 ++- .../loot_tables/blocks/ashstone_block.json | 6 ++- .../loot_tables/blocks/ashstone_ore.json | 3 +- .../loot_tables/blocks/dragonstone_block.json | 6 ++- .../loot_tables/blocks/dragonstone_ore.json | 3 +- .../loot_tables/blocks/fyrite_block.json | 6 ++- .../loot_tables/blocks/fyrite_ore.json | 6 ++- .../loot_tables/blocks/illumenite_block.json | 6 ++- .../loot_tables/blocks/illumenite_ore.json | 6 ++- .../loot_tables/blocks/malachite_block.json | 6 ++- .../loot_tables/blocks/malachite_ore.json | 6 ++- .../blocks/nether_blast_furnace.json | 3 +- .../loot_tables/blocks/nether_furnace.json | 3 +- .../loot_tables/blocks/nether_smoker.json | 3 +- .../loot_tables/inject/bastion.json | 50 +++++++++++------- .../loot_tables/inject/desert_pyramid.json | 31 +++++++---- .../loot_tables/inject/jungle_temple.json | 24 ++++++--- .../loot_tables/inject/ruined_portal.json | 52 ++++++++++++------- .../loot_tables/inject/stronghold.json | 38 +++++++++----- 39 files changed, 266 insertions(+), 109 deletions(-) create mode 100644 src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json new file mode 100644 index 00000000..a49179c1 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -0,0 +1,19 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_block", + "netherrocks:argonite_ore", + "netherrocks:ashstone_block", + "netherrocks:ashstone_ore", + "netherrocks:dragonstone_block", + "netherrocks:dragonstone_ore", + "netherrocks:fyrite_block", + "netherrocks:illumenite_block", + "netherrocks:illumenite_ore", + "netherrocks:malachite_block", + "netherrocks:malachite_ore", + "netherrocks:nether_blast_furnace", + "netherrocks:nether_furnace", + "netherrocks:nether_smoker" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json new file mode 100644 index 00000000..c26494f7 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_block", + "netherrocks:argonite_ore", + "netherrocks:ashstone_block", + "netherrocks:ashstone_ore", + "netherrocks:dragonstone_block", + "netherrocks:dragonstone_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json new file mode 100644 index 00000000..049c371a --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "netherrocks:fyrite_block", + "netherrocks:fyrite_ore", + "netherrocks:illumenite_block", + "netherrocks:illumenite_ore", + "netherrocks:malachite_block", + "netherrocks:malachite_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_chunks.json index b8650f2f..0157b0df 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_argonite_ore" + "items": [ + "netherrocks:crushed_argonite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_dust.json index 7808d68a..50ce5b1b 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:argonite_dust" + "items": [ + "netherrocks:argonite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_chunks.json index b63e0cd3..92036729 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_argonite_ore" + "items": [ + "netherrocks:crushed_argonite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_dust.json index 78fb24dd..8e8ca8af 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:argonite_dust" + "items": [ + "netherrocks:argonite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_chunks.json index f25e3687..638e1bd4 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_fyrite_ore" + "items": [ + "netherrocks:crushed_fyrite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_dust.json index 1c8a2949..89220131 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:fyrite_dust" + "items": [ + "netherrocks:fyrite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_chunks.json index aaa71704..0285cb04 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_fyrite_ore" + "items": [ + "netherrocks:crushed_fyrite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_dust.json index a55e986a..ecf7fcce 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:fyrite_dust" + "items": [ + "netherrocks:fyrite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_chunks.json index 1cffb8bc..db6b6382 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_illumenite_ore" + "items": [ + "netherrocks:crushed_illumenite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_dust.json index 5cbb8cce..a640af84 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:illumenite_dust" + "items": [ + "netherrocks:illumenite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_chunks.json index 7933bd11..f3bad686 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_illumenite_ore" + "items": [ + "netherrocks:crushed_illumenite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_dust.json index baf10059..8ee54578 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:illumenite_dust" + "items": [ + "netherrocks:illumenite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_chunks.json index f158de2d..ed2e678e 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_malachite_ore" + "items": [ + "netherrocks:crushed_malachite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_dust.json index 7351b70f..ab65133c 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:malachite_dust" + "items": [ + "netherrocks:malachite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_chunks.json index 10344e42..d6dacb9f 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_malachite_ore" + "items": [ + "netherrocks:crushed_malachite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_dust.json index 24a111a4..78e32b83 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:malachite_dust" + "items": [ + "netherrocks:malachite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_block.json index 016f15df..e76c86ef 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_block.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -13,7 +14,8 @@ { "condition": "minecraft:survives_explosion" } - ] + ], + "functions": [] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_ore.json index 53569bfa..ca39dbdf 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_ore.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -13,7 +14,8 @@ { "condition": "minecraft:survives_explosion" } - ] + ], + "functions": [] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_block.json index f6837f98..e58d710f 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_block.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -13,7 +14,8 @@ { "condition": "minecraft:survives_explosion" } - ] + ], + "functions": [] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_ore.json index da72ac6b..e32617b6 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_ore.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_block.json index 0d4bf4c3..59072e50 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_block.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -13,7 +14,8 @@ { "condition": "minecraft:survives_explosion" } - ] + ], + "functions": [] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_ore.json index c397c85a..fd24dd35 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_ore.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_block.json index 3d400108..1a877de9 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_block.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -13,7 +14,8 @@ { "condition": "minecraft:survives_explosion" } - ] + ], + "functions": [] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_ore.json index 14133eb3..b0555561 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_ore.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -13,7 +14,8 @@ { "condition": "minecraft:survives_explosion" } - ] + ], + "functions": [] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_block.json index 67c1ace8..eb96c8e0 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_block.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -13,7 +14,8 @@ { "condition": "minecraft:survives_explosion" } - ] + ], + "functions": [] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_ore.json index b2ab6e93..6a5d08de 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_ore.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -13,7 +14,8 @@ { "condition": "minecraft:survives_explosion" } - ] + ], + "functions": [] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_block.json index d0e7c4da..94d94f43 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_block.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -13,7 +14,8 @@ { "condition": "minecraft:survives_explosion" } - ] + ], + "functions": [] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_ore.json index c8f4dfa0..1b895a32 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_ore.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -13,7 +14,8 @@ { "condition": "minecraft:survives_explosion" } - ] + ], + "functions": [] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_blast_furnace.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_blast_furnace.json index cb62d622..674953cd 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_blast_furnace.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_blast_furnace.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_furnace.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_furnace.json index 9b72711f..fb47b518 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_furnace.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_furnace.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_smoker.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_smoker.json index 042c894c..54678960 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_smoker.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_smoker.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/bastion.json b/src/generated/resources/data/netherrocks/loot_tables/inject/bastion.json index 0188221c..1ff36dde 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/bastion.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/bastion.json @@ -4,10 +4,11 @@ { "name": "main", "rolls": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" + "max": 2.0 }, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -184,10 +185,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 2.0, - "max": 4.0, - "type": "minecraft:uniform" - } + "max": 4.0 + }, + "add": false } ], "name": "netherrocks:malachite_ingot" @@ -199,10 +201,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 3.0, - "type": "minecraft:uniform" - } + "max": 3.0 + }, + "add": false } ], "name": "netherrocks:argonite_ingot" @@ -214,10 +217,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:fyrite_ingot" @@ -228,10 +232,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:illumenite_ingot" @@ -242,10 +247,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:ashstone_gem" @@ -255,7 +261,12 @@ "functions": [ { "function": "minecraft:set_count", - "count": 1.0 + "count": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 1.0 + }, + "add": false } ], "name": "netherrocks:dragonstone_gem" @@ -266,7 +277,8 @@ "condition": "minecraft:random_chance", "chance": 0.75 } - ] + ], + "functions": [] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/desert_pyramid.json b/src/generated/resources/data/netherrocks/loot_tables/inject/desert_pyramid.json index 3a8c6306..91acd1f8 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/desert_pyramid.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/desert_pyramid.json @@ -3,7 +3,12 @@ "pools": [ { "name": "main", - "rolls": 1.0, + "rolls": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 1.0 + }, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -12,10 +17,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:fyrite_ingot" @@ -27,10 +33,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:illumenite_ingot" @@ -40,7 +47,12 @@ "functions": [ { "function": "minecraft:set_count", - "count": 1.0 + "count": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 1.0 + }, + "add": false } ], "name": "netherrocks:dragonstone_gem" @@ -51,7 +63,8 @@ "condition": "minecraft:random_chance", "chance": 0.25 } - ] + ], + "functions": [] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/jungle_temple.json b/src/generated/resources/data/netherrocks/loot_tables/inject/jungle_temple.json index d164afb7..b67899a5 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/jungle_temple.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/jungle_temple.json @@ -3,7 +3,12 @@ "pools": [ { "name": "main", - "rolls": 1.0, + "rolls": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 1.0 + }, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -12,10 +17,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 2.0, - "max": 4.0, - "type": "minecraft:uniform" - } + "max": 4.0 + }, + "add": false } ], "name": "netherrocks:malachite_ingot" @@ -26,10 +32,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:ashstone_gem" @@ -40,7 +47,8 @@ "condition": "minecraft:random_chance", "chance": 0.25 } - ] + ], + "functions": [] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/ruined_portal.json b/src/generated/resources/data/netherrocks/loot_tables/inject/ruined_portal.json index d81b8c0f..1949e3be 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/ruined_portal.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/ruined_portal.json @@ -3,7 +3,12 @@ "pools": [ { "name": "main", - "rolls": 1.0, + "rolls": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 1.0 + }, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -12,10 +17,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 2.0, - "max": 4.0, - "type": "minecraft:uniform" - } + "max": 4.0 + }, + "add": false } ], "name": "netherrocks:malachite_ingot" @@ -27,10 +33,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 3.0, - "type": "minecraft:uniform" - } + "max": 3.0 + }, + "add": false } ], "name": "netherrocks:argonite_ingot" @@ -42,10 +49,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:fyrite_ingot" @@ -57,10 +65,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:illumenite_ingot" @@ -71,10 +80,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:ashstone_gem" @@ -84,7 +94,12 @@ "functions": [ { "function": "minecraft:set_count", - "count": 1.0 + "count": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 1.0 + }, + "add": false } ], "name": "netherrocks:dragonstone_gem" @@ -95,7 +110,8 @@ "condition": "minecraft:random_chance", "chance": 0.5 } - ] + ], + "functions": [] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/stronghold.json b/src/generated/resources/data/netherrocks/loot_tables/inject/stronghold.json index 1624a0d2..be465530 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/stronghold.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/stronghold.json @@ -3,7 +3,12 @@ "pools": [ { "name": "main", - "rolls": 1.0, + "rolls": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 1.0 + }, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -40,10 +45,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 2.0, - "max": 4.0, - "type": "minecraft:uniform" - } + "max": 4.0 + }, + "add": false } ], "name": "netherrocks:malachite_ingot" @@ -55,10 +61,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 3.0, - "type": "minecraft:uniform" - } + "max": 3.0 + }, + "add": false } ], "name": "netherrocks:argonite_ingot" @@ -70,10 +77,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:fyrite_ingot" @@ -84,10 +92,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:illumenite_ingot" @@ -98,7 +107,8 @@ "condition": "minecraft:random_chance", "chance": 0.25 } - ] + ], + "functions": [] } ] } \ No newline at end of file From 08e6777a184545cba76bb8f13de84d44bd3f044f Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 21 Aug 2021 15:57:29 -0500 Subject: [PATCH 12/56] created scripts to make new raw_metal blocks & item models --- scripts/generate_jsons.sh | 47 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100755 scripts/generate_jsons.sh diff --git a/scripts/generate_jsons.sh b/scripts/generate_jsons.sh new file mode 100755 index 00000000..5eeb2128 --- /dev/null +++ b/scripts/generate_jsons.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +# scripts are from mod_utils project on my GitHub. + +ID='netherrocks' +NAME='Netherrocks' +TOPDIR=`pwd` +PROJNAME=`basename $TOPDIR` +if [ $PROJNAME != $NAME ]; then + echo "Running in wrong directory!" + exit 1 +fi + +# blockstates +TARGETDIR=${TOPDIR}/src/main/resources/assets/${ID}/blockstates +if [ ! -d $TARGETDIR ]; then + mkdir -p $TARGETDIR +fi +cd $TARGETDIR + +# make simple blockstates +gen_blockstate_jsons.py --type=simple raw_fyrite_block +gen_blockstate_jsons.py --type=simple raw_illumenite_block +gen_blockstate_jsons.py --type=simple raw_argonite_block +gen_blockstate_jsons.py --type=simple raw_malachite_block +gen_blockstate_jsons.py --type=simple dark_fyrite_block + +# models +TARGETDIR=${TOPDIR}/src/main/resources/assets/${ID}/models +if [ ! -d $TARGETDIR ]; then + mkdir -p $TARGETDIR +fi +cd $TARGETDIR + +# block models +gen_model_jsons.py --type=block raw_fyrite_block +gen_model_jsons.py --type=block dark_fyrite_block +gen_model_jsons.py --type=block raw_illumenite_block +gen_model_jsons.py --type=block raw_argonite_block +gen_model_jsons.py --type=block raw_malachite_block + +#inventory items +gen_model_jsons.py --type=inventory --item_only raw_fyrite +gen_model_jsons.py --type=inventory --item_only raw_illumenite +gen_model_jsons.py --type=inventory --item_only raw_argonite +gen_model_jsons.py --type=inventory --item_only raw_malachite + From 35c68333783f158b4f1892070c04b759bb2c593c Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 21 Aug 2021 16:02:49 -0500 Subject: [PATCH 13/56] added raw materials models, blockstates, and to en_us lang --- .../netherrocks/blockstates/dark_fyrite_block.json | 7 +++++++ .../netherrocks/blockstates/raw_argonite_block.json | 7 +++++++ .../netherrocks/blockstates/raw_fyrite_block.json | 7 +++++++ .../netherrocks/blockstates/raw_illumenite_block.json | 7 +++++++ .../netherrocks/blockstates/raw_malachite_block.json | 7 +++++++ src/main/resources/assets/netherrocks/lang/en_us.json | 11 ++++++++++- .../netherrocks/models/block/dark_fyrite_block.json | 6 ++++++ .../netherrocks/models/block/raw_argonite_block.json | 6 ++++++ .../netherrocks/models/block/raw_fyrite_block.json | 6 ++++++ .../models/block/raw_illumenite_block.json | 6 ++++++ .../netherrocks/models/block/raw_malachite_block.json | 6 ++++++ .../netherrocks/models/item/dark_fyrite_block.json | 3 +++ .../assets/netherrocks/models/item/raw_argonite.json | 6 ++++++ .../netherrocks/models/item/raw_argonite_block.json | 3 +++ .../assets/netherrocks/models/item/raw_fyrite.json | 6 ++++++ .../netherrocks/models/item/raw_fyrite_block.json | 3 +++ .../netherrocks/models/item/raw_illumenite.json | 6 ++++++ .../netherrocks/models/item/raw_illumenite_block.json | 3 +++ .../assets/netherrocks/models/item/raw_malachite.json | 6 ++++++ .../netherrocks/models/item/raw_malachite_block.json | 3 +++ 20 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/netherrocks/blockstates/dark_fyrite_block.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/raw_argonite_block.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/raw_fyrite_block.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/raw_illumenite_block.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/raw_malachite_block.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dark_fyrite_block.json create mode 100644 src/main/resources/assets/netherrocks/models/block/raw_argonite_block.json create mode 100644 src/main/resources/assets/netherrocks/models/block/raw_fyrite_block.json create mode 100644 src/main/resources/assets/netherrocks/models/block/raw_illumenite_block.json create mode 100644 src/main/resources/assets/netherrocks/models/block/raw_malachite_block.json create mode 100644 src/main/resources/assets/netherrocks/models/item/dark_fyrite_block.json create mode 100644 src/main/resources/assets/netherrocks/models/item/raw_argonite.json create mode 100644 src/main/resources/assets/netherrocks/models/item/raw_argonite_block.json create mode 100644 src/main/resources/assets/netherrocks/models/item/raw_fyrite.json create mode 100644 src/main/resources/assets/netherrocks/models/item/raw_fyrite_block.json create mode 100644 src/main/resources/assets/netherrocks/models/item/raw_illumenite.json create mode 100644 src/main/resources/assets/netherrocks/models/item/raw_illumenite_block.json create mode 100644 src/main/resources/assets/netherrocks/models/item/raw_malachite.json create mode 100644 src/main/resources/assets/netherrocks/models/item/raw_malachite_block.json diff --git a/src/main/resources/assets/netherrocks/blockstates/dark_fyrite_block.json b/src/main/resources/assets/netherrocks/blockstates/dark_fyrite_block.json new file mode 100644 index 00000000..2559b727 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/dark_fyrite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "netherrocks:block/dark_fyrite_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/raw_argonite_block.json b/src/main/resources/assets/netherrocks/blockstates/raw_argonite_block.json new file mode 100644 index 00000000..0e6fa967 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/raw_argonite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "netherrocks:block/raw_argonite_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/raw_fyrite_block.json b/src/main/resources/assets/netherrocks/blockstates/raw_fyrite_block.json new file mode 100644 index 00000000..cc39aebb --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/raw_fyrite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "netherrocks:block/raw_fyrite_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/raw_illumenite_block.json b/src/main/resources/assets/netherrocks/blockstates/raw_illumenite_block.json new file mode 100644 index 00000000..acf91785 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/raw_illumenite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "netherrocks:block/raw_illumenite_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/raw_malachite_block.json b/src/main/resources/assets/netherrocks/blockstates/raw_malachite_block.json new file mode 100644 index 00000000..49288c27 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/raw_malachite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "netherrocks:block/raw_malachite_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/lang/en_us.json b/src/main/resources/assets/netherrocks/lang/en_us.json index 2ee07282..736650fa 100644 --- a/src/main/resources/assets/netherrocks/lang/en_us.json +++ b/src/main/resources/assets/netherrocks/lang/en_us.json @@ -8,16 +8,21 @@ "material.netherrocks.dragonstone": "Dragonstone", "block.netherrocks.fyrite_ore": "Fyrite Ore", "block.netherrocks.fyrite_block": "Fyrite Block", + "block.netherrocks.dark_fyrite_block": "Dark Fyrite Block", + "block.netherrocks.raw_fyrite_block": "Raw Fyrite Block", "block.netherrocks.malachite_ore": "Malachite Ore", "block.netherrocks.malachite_block": "Malachite Block", + "block.netherrocks.raw_malachite_block": "Raw Malachite Block", "block.netherrocks.ashstone_ore": "Ashstone Ore", "block.netherrocks.ashstone_block": "Ashstone Block", "block.netherrocks.illumenite_ore": "Illumenite Ore", "block.netherrocks.illumenite_block": "Illumenite Block", + "block.netherrocks.raw_illumenite_block": "Raw Illumenite Block", "block.netherrocks.dragonstone_ore": "Dragonstone Ore", "block.netherrocks.dragonstone_block": "Dragonstone Block", "block.netherrocks.argonite_ore": "Argonite Ore", "block.netherrocks.argonite_block": "Argonite Block", + "block.netherrocks.raw_argonite_block": "Raw Argonite Block", "block.netherrocks.nether_furnace": "Nether Furnace", "block.netherrocks.nether_furnace_burning": "Nether Furnace", "block.netherrocks.nether_blast_furnace" : "Nether Blast Furnace", @@ -26,11 +31,15 @@ "block.netherrocks.nether_smoker_burning" : "Nether Smoker", "item.netherrocks.fyrite_ingot": "Fyrite Ingot", + "item.netherrocks.raw_fyrite": "Raw Fyrite", "item.netherrocks.malachite_ingot": "Malachite Ingot", + "item.netherrocks.raw_malachite": "Raw Malachite", "item.netherrocks.ashstone_gem": "Ashstone Gem", "item.netherrocks.illumenite_ingot": "Illumenite Ingot", + "item.netherrocks.raw_illumenite": "Raw Illumenite", "item.netherrocks.dragonstone_gem": "Dragonstone Gem", "item.netherrocks.argonite_ingot": "Argonite Ingot", + "item.netherrocks.raw_argonite": "Raw Argonite", "item.netherrocks.fyrite_nugget": "Fyrite Nugget", "item.netherrocks.malachite_nugget": "Malachite Nugget", @@ -132,4 +141,4 @@ "netherrocks.fyrite_shovel.info": "§aInstant glass when digging up sand.", "netherrocks.fyrite_sword.info": "§aHarnesses the power of fire.", "netherrocks.illumenite_sword.info": "§aGrants night vision on hit. Blinds and slows target." -} \ No newline at end of file +} diff --git a/src/main/resources/assets/netherrocks/models/block/dark_fyrite_block.json b/src/main/resources/assets/netherrocks/models/block/dark_fyrite_block.json new file mode 100644 index 00000000..ece1c363 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dark_fyrite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/fyrite_block_alt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/raw_argonite_block.json b/src/main/resources/assets/netherrocks/models/block/raw_argonite_block.json new file mode 100644 index 00000000..214d80a1 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/raw_argonite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/raw_argonite_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/raw_fyrite_block.json b/src/main/resources/assets/netherrocks/models/block/raw_fyrite_block.json new file mode 100644 index 00000000..d66cb327 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/raw_fyrite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/raw_fyrite_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/raw_illumenite_block.json b/src/main/resources/assets/netherrocks/models/block/raw_illumenite_block.json new file mode 100644 index 00000000..90a2e83e --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/raw_illumenite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/raw_illumenite_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/raw_malachite_block.json b/src/main/resources/assets/netherrocks/models/block/raw_malachite_block.json new file mode 100644 index 00000000..2668460e --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/raw_malachite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/raw_malachite_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/dark_fyrite_block.json b/src/main/resources/assets/netherrocks/models/item/dark_fyrite_block.json new file mode 100644 index 00000000..77e394a8 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/dark_fyrite_block.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/dark_fyrite_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_argonite.json b/src/main/resources/assets/netherrocks/models/item/raw_argonite.json new file mode 100644 index 00000000..0e68ac19 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_argonite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "netherrocks:item/raw_argonite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_argonite_block.json b/src/main/resources/assets/netherrocks/models/item/raw_argonite_block.json new file mode 100644 index 00000000..35987a37 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_argonite_block.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/raw_argonite_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_fyrite.json b/src/main/resources/assets/netherrocks/models/item/raw_fyrite.json new file mode 100644 index 00000000..736c4db1 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_fyrite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "netherrocks:item/raw_fyrite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_fyrite_block.json b/src/main/resources/assets/netherrocks/models/item/raw_fyrite_block.json new file mode 100644 index 00000000..ef7a25f9 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_fyrite_block.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/raw_fyrite_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_illumenite.json b/src/main/resources/assets/netherrocks/models/item/raw_illumenite.json new file mode 100644 index 00000000..d769c362 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_illumenite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "netherrocks:item/raw_illumenite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_illumenite_block.json b/src/main/resources/assets/netherrocks/models/item/raw_illumenite_block.json new file mode 100644 index 00000000..dd635efd --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_illumenite_block.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/raw_illumenite_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_malachite.json b/src/main/resources/assets/netherrocks/models/item/raw_malachite.json new file mode 100644 index 00000000..7a27f6c8 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_malachite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "netherrocks:item/raw_malachite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_malachite_block.json b/src/main/resources/assets/netherrocks/models/item/raw_malachite_block.json new file mode 100644 index 00000000..bac9ce0a --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_malachite_block.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/raw_malachite_block" +} \ No newline at end of file From bb65645a6acdd36c42ebd20bb614526a5c2110c5 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 21 Aug 2021 16:06:42 -0500 Subject: [PATCH 14/56] added raw_metal blocks and items --- .../mod/alexndr/netherrocks/init/ModBlocks.java | 16 ++++++++++++++++ .../mod/alexndr/netherrocks/init/ModItems.java | 8 ++++++++ 2 files changed, 24 insertions(+) diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java b/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java index 42655943..fd7ea4af 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java @@ -64,16 +64,32 @@ public final class ModBlocks public static final RegistryObject argonite_block = BLOCKS.register("argonite_block", () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.COLOR_BLUE) .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final RegistryObject raw_argonite_block = BLOCKS.register("raw_argonite_block", + () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.COLOR_BLUE) + .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static final RegistryObject fyrite_block = BLOCKS.register("fyrite_block", () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.FIRE) .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final RegistryObject dark_fyrite_block = BLOCKS.register("dark_fyrite_block", + () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.FIRE) + .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final RegistryObject raw_fyrite_block = BLOCKS.register("raw_fyrite_block", + () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.FIRE) + .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static final RegistryObject illumenite_block = BLOCKS.register("illumenite_block", () -> new Block(Block.Properties.of(Material.GLASS, MaterialColor.COLOR_YELLOW) .strength(7.0F, 72.0F).sound(SoundType.GLASS).requiresCorrectToolForDrops() .lightLevel(LightUtils.setFixedLight(15)))); + public static final RegistryObject raw_illumenite_block = BLOCKS.register("raw_illumenite_block", + () -> new Block(Block.Properties.of(Material.GLASS, MaterialColor.COLOR_YELLOW) + .strength(7.0F, 72.0F).sound(SoundType.GLASS).requiresCorrectToolForDrops() + .lightLevel(LightUtils.setFixedLight(15)))); public static final RegistryObject malachite_block = BLOCKS.register("malachite_block", () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.EMERALD) .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final RegistryObject raw_malachite_block = BLOCKS.register("raw_malachite_block", + () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.EMERALD) + .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); // Furnace public static final RegistryObject nether_furnace = BLOCKS.register("nether_furnace", diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModItems.java b/src/main/java/mod/alexndr/netherrocks/init/ModItems.java index 93245427..0acbeddd 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModItems.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModItems.java @@ -50,6 +50,8 @@ public final class ModItems () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject crushed_argonite_ore = ITEMS.register("crushed_argonite_ore", () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); + public static final RegistryObject raw_argonite = ITEMS.register("raw_argonite", + () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_gem = ITEMS.register("dragonstone_gem", () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); @@ -64,6 +66,8 @@ public final class ModItems () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject crushed_fyrite_ore = ITEMS.register("crushed_fyrite_ore", () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); + public static final RegistryObject raw_fyrite = ITEMS.register("raw_fyrite", + () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject illumenite_ingot = ITEMS.register("illumenite_ingot", () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); @@ -73,6 +77,8 @@ public final class ModItems () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject crushed_illumenite_ore = ITEMS.register("crushed_illumenite_ore", () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); + public static final RegistryObject raw_illumenite = ITEMS.register("raw_illumenite", + () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_ingot = ITEMS.register("malachite_ingot", () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); @@ -82,6 +88,8 @@ public final class ModItems () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject crushed_malachite_ore = ITEMS.register("crushed_malachite_ore", () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); + public static final RegistryObject raw_malachite = ITEMS.register("raw_malachite", + () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // TOOLS & WEAPONS From b273075d0fdcf5d1f95529df0d048c3b02cd4dd6 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 21 Aug 2021 16:10:20 -0500 Subject: [PATCH 15/56] updated pack.mcmeta version; added raw_metals to ore drops, and raw_metal_blocks to drop tables --- .../datagen/NetherrocksLootTableProvider.java | 14 ++++++++++---- src/main/resources/pack.mcmeta | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java index f247c95a..d5a4f2e8 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java @@ -29,17 +29,23 @@ protected List>>, L { tables.clear(); standardDropTable(ModBlocks.argonite_block.get()); - standardDropTable(ModBlocks.argonite_ore.get()); + standardDropTable(ModBlocks.raw_argonite_block.get()); + specialDropTable(ModBlocks.argonite_ore.get(), ModItems.raw_argonite.get()); standardDropTable(ModBlocks.ashstone_block.get()); specialDropTable(ModBlocks.ashstone_ore.get(), ModItems.ashstone_gem.get()); standardDropTable(ModBlocks.dragonstone_block.get()); specialDropTable(ModBlocks.dragonstone_ore.get(), ModItems.dragonstone_gem.get()); standardDropTable(ModBlocks.fyrite_block.get()); - standardDropTable(ModBlocks.fyrite_ore.get()); + standardDropTable(ModBlocks.raw_fyrite_block.get()); + standardDropTable(ModBlocks.dark_fyrite_block.get()); + specialDropTable(ModBlocks.fyrite_ore.get(), ModItems.raw_fyrite.get()); standardDropTable(ModBlocks.illumenite_block.get()); - standardDropTable(ModBlocks.illumenite_ore.get()); + standardDropTable(ModBlocks.raw_illumenite_block.get()); + specialDropTable(ModBlocks.illumenite_ore.get(), ModItems.raw_illumenite.get()); standardDropTable(ModBlocks.malachite_block.get()); - standardDropTable(ModBlocks.malachite_ore.get()); + standardDropTable(ModBlocks.raw_malachite_block.get()); + specialDropTable(ModBlocks.malachite_ore.get(), ModItems.raw_malachite.get()); + copyNameDropTable(ModBlocks.nether_blast_furnace.get(), ModBlocks.nether_blast_furnace.get().asItem()); copyNameDropTable(ModBlocks.nether_furnace.get(), diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index c05761bb..77ccc42c 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack":{ - "pack_format": 6, + "pack_format": 7, "description":"SimpleOres:Netherrocks resources" } } \ No newline at end of file From 133c0ad14ed49f85c91c9d9bb47f6cb50b6a2c39 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 21 Aug 2021 16:12:04 -0500 Subject: [PATCH 16/56] added generated loot tables --- .../loot_tables/blocks/argonite_ore.json | 46 +++++++++++++++---- .../loot_tables/blocks/dark_fyrite_block.json | 21 +++++++++ .../loot_tables/blocks/fyrite_ore.json | 46 +++++++++++++++---- .../loot_tables/blocks/illumenite_ore.json | 46 +++++++++++++++---- .../loot_tables/blocks/malachite_ore.json | 46 +++++++++++++++---- .../blocks/raw_argonite_block.json | 21 +++++++++ .../loot_tables/blocks/raw_fyrite_block.json | 21 +++++++++ .../blocks/raw_illumenite_block.json | 21 +++++++++ .../blocks/raw_malachite_block.json | 21 +++++++++ 9 files changed, 253 insertions(+), 36 deletions(-) create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/dark_fyrite_block.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/raw_argonite_block.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/raw_fyrite_block.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/raw_illumenite_block.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/raw_malachite_block.json diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_ore.json index ca39dbdf..46ffa2b1 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_ore.json @@ -6,16 +6,44 @@ "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "name": "netherrocks:argonite_ore" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "netherrocks:argonite_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "netherrocks:raw_argonite" + } + ] } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dark_fyrite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dark_fyrite_block.json new file mode 100644 index 00000000..608bff97 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dark_fyrite_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:dark_fyrite_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_ore.json index b0555561..169863d1 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_ore.json @@ -6,16 +6,44 @@ "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "name": "netherrocks:fyrite_ore" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "netherrocks:fyrite_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "netherrocks:raw_fyrite" + } + ] } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_ore.json index 6a5d08de..cbb26fb1 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_ore.json @@ -6,16 +6,44 @@ "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "name": "netherrocks:illumenite_ore" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "netherrocks:illumenite_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "netherrocks:raw_illumenite" + } + ] } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_ore.json index 1b895a32..d3fc0e45 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_ore.json @@ -6,16 +6,44 @@ "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "name": "netherrocks:malachite_ore" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "netherrocks:malachite_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "netherrocks:raw_malachite" + } + ] } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_argonite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_argonite_block.json new file mode 100644 index 00000000..eda30d42 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_argonite_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:raw_argonite_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_fyrite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_fyrite_block.json new file mode 100644 index 00000000..b3a75be9 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_fyrite_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:raw_fyrite_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_illumenite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_illumenite_block.json new file mode 100644 index 00000000..c1eff668 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_illumenite_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:raw_illumenite_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_malachite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_malachite_block.json new file mode 100644 index 00000000..31293980 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_malachite_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:raw_malachite_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file From df2d9eb1e58b55d53a4becf9929ae8f4ddfb6e33 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 21 Aug 2021 16:20:44 -0500 Subject: [PATCH 17/56] removed test block for dark fyrite; switched to new texture for fyrite block --- scripts/generate_jsons.sh | 2 -- .../netherrocks/datagen/NetherrocksLootTableProvider.java | 1 - src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java | 3 --- .../assets/netherrocks/blockstates/dark_fyrite_block.json | 7 ------- src/main/resources/assets/netherrocks/lang/en_us.json | 1 - .../assets/netherrocks/models/block/dark_fyrite_block.json | 6 ------ .../assets/netherrocks/models/block/fyrite_block.json | 2 +- .../assets/netherrocks/models/item/dark_fyrite_block.json | 3 --- 8 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 src/main/resources/assets/netherrocks/blockstates/dark_fyrite_block.json delete mode 100644 src/main/resources/assets/netherrocks/models/block/dark_fyrite_block.json delete mode 100644 src/main/resources/assets/netherrocks/models/item/dark_fyrite_block.json diff --git a/scripts/generate_jsons.sh b/scripts/generate_jsons.sh index 5eeb2128..8a2889fa 100755 --- a/scripts/generate_jsons.sh +++ b/scripts/generate_jsons.sh @@ -23,7 +23,6 @@ gen_blockstate_jsons.py --type=simple raw_fyrite_block gen_blockstate_jsons.py --type=simple raw_illumenite_block gen_blockstate_jsons.py --type=simple raw_argonite_block gen_blockstate_jsons.py --type=simple raw_malachite_block -gen_blockstate_jsons.py --type=simple dark_fyrite_block # models TARGETDIR=${TOPDIR}/src/main/resources/assets/${ID}/models @@ -34,7 +33,6 @@ cd $TARGETDIR # block models gen_model_jsons.py --type=block raw_fyrite_block -gen_model_jsons.py --type=block dark_fyrite_block gen_model_jsons.py --type=block raw_illumenite_block gen_model_jsons.py --type=block raw_argonite_block gen_model_jsons.py --type=block raw_malachite_block diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java index d5a4f2e8..90d4ea2e 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java @@ -37,7 +37,6 @@ protected List>>, L specialDropTable(ModBlocks.dragonstone_ore.get(), ModItems.dragonstone_gem.get()); standardDropTable(ModBlocks.fyrite_block.get()); standardDropTable(ModBlocks.raw_fyrite_block.get()); - standardDropTable(ModBlocks.dark_fyrite_block.get()); specialDropTable(ModBlocks.fyrite_ore.get(), ModItems.raw_fyrite.get()); standardDropTable(ModBlocks.illumenite_block.get()); standardDropTable(ModBlocks.raw_illumenite_block.get()); diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java b/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java index fd7ea4af..331cbc63 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java @@ -70,9 +70,6 @@ public final class ModBlocks public static final RegistryObject fyrite_block = BLOCKS.register("fyrite_block", () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.FIRE) .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final RegistryObject dark_fyrite_block = BLOCKS.register("dark_fyrite_block", - () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.FIRE) - .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static final RegistryObject raw_fyrite_block = BLOCKS.register("raw_fyrite_block", () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.FIRE) .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); diff --git a/src/main/resources/assets/netherrocks/blockstates/dark_fyrite_block.json b/src/main/resources/assets/netherrocks/blockstates/dark_fyrite_block.json deleted file mode 100644 index 2559b727..00000000 --- a/src/main/resources/assets/netherrocks/blockstates/dark_fyrite_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "netherrocks:block/dark_fyrite_block" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/lang/en_us.json b/src/main/resources/assets/netherrocks/lang/en_us.json index 736650fa..665e5253 100644 --- a/src/main/resources/assets/netherrocks/lang/en_us.json +++ b/src/main/resources/assets/netherrocks/lang/en_us.json @@ -8,7 +8,6 @@ "material.netherrocks.dragonstone": "Dragonstone", "block.netherrocks.fyrite_ore": "Fyrite Ore", "block.netherrocks.fyrite_block": "Fyrite Block", - "block.netherrocks.dark_fyrite_block": "Dark Fyrite Block", "block.netherrocks.raw_fyrite_block": "Raw Fyrite Block", "block.netherrocks.malachite_ore": "Malachite Ore", "block.netherrocks.malachite_block": "Malachite Block", diff --git a/src/main/resources/assets/netherrocks/models/block/dark_fyrite_block.json b/src/main/resources/assets/netherrocks/models/block/dark_fyrite_block.json deleted file mode 100644 index ece1c363..00000000 --- a/src/main/resources/assets/netherrocks/models/block/dark_fyrite_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "netherrocks:block/fyrite_block_alt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_block.json b/src/main/resources/assets/netherrocks/models/block/fyrite_block.json index b2043826..6db65eb0 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_block.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_block.json @@ -1,4 +1,4 @@ { "parent": "block/cube_all", - "textures": { "all": "netherrocks:block/fyrite_block" } + "textures": { "all": "netherrocks:block/fyrite_block_alt" } } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/dark_fyrite_block.json b/src/main/resources/assets/netherrocks/models/item/dark_fyrite_block.json deleted file mode 100644 index 77e394a8..00000000 --- a/src/main/resources/assets/netherrocks/models/item/dark_fyrite_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "netherrocks:block/dark_fyrite_block" -} \ No newline at end of file From a18555ad761cd5d54f97c1ceb572cb1869d24cef Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 21 Aug 2021 16:23:58 -0500 Subject: [PATCH 18/56] updated README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 62291f6c..a000484f 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,9 @@ Forge mods. I hope I did a good job with it. TO DO ----- +* [1.17.1] add missing raw metal textures. +* [1.17.1] add datagen recipes for raw_metal_blocks & smelting/blasting raw_metal. +* [1.17.1] add datagen storage block tags for raw_metal blocks. * update/move wiki * Decide if we really need more detailed configs than that. * Add shears for all metals. From 1eed7e0bc362f0216da39dcad39116f247729b91 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sun, 22 Aug 2021 09:01:23 -0500 Subject: [PATCH 19/56] removed a bunch of hand-tweaked json files because they are now in datagen --- README.md | 2 +- .../tags/blocks/mineable/pickaxe.json | 4 ++ .../tags/blocks/needs_diamond_tool.json | 3 +- .../tags/blocks/needs_iron_tool.json | 5 +- .../loot_tables/blocks/dark_fyrite_block.json | 21 ------ .../netherrocks/datagen/ModBlockTags.java | 67 ++++++++++++++++++- .../datagen/NetherrocksDataGenerator.java | 1 + .../forge/tags/blocks/storage_blocks.json | 11 --- .../tags/blocks/storage_blocks/argonite.json | 6 -- .../tags/blocks/storage_blocks/ashstone.json | 6 -- .../blocks/storage_blocks/dragonstone.json | 6 -- .../tags/blocks/storage_blocks/fyrite.json | 6 -- .../blocks/storage_blocks/illumenite.json | 6 -- .../tags/blocks/storage_blocks/malachite.json | 6 -- .../data/forge/tags/items/storage_blocks.json | 11 --- .../tags/items/storage_blocks/argonite.json | 6 -- .../tags/items/storage_blocks/ashstone.json | 6 -- .../items/storage_blocks/dragonstone.json | 6 -- .../tags/items/storage_blocks/fyrite.json | 6 -- .../tags/items/storage_blocks/illumenite.json | 6 -- .../tags/items/storage_blocks/malachite.json | 6 -- .../tags/blocks/beacon_base_blocks.json | 9 --- .../recipes/argonite_ingot_from_blasting.json | 9 --- .../recipes/argonite_ingot_from_smelting.json | 9 --- .../recipes/fyrite_ingot_from_blasting.json | 9 --- .../recipes/fyrite_ingot_from_smelting.json | 9 --- .../illumenite_ingot_from_blasting.json | 9 --- .../illumenite_ingot_from_smelting.json | 9 --- .../malachite_ingot_from_blasting.json | 9 --- .../malachite_ingot_from_smelting.json | 9 --- 30 files changed, 76 insertions(+), 202 deletions(-) delete mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/dark_fyrite_block.json delete mode 100644 src/main/resources/data/forge/tags/blocks/storage_blocks.json delete mode 100644 src/main/resources/data/forge/tags/blocks/storage_blocks/argonite.json delete mode 100644 src/main/resources/data/forge/tags/blocks/storage_blocks/ashstone.json delete mode 100644 src/main/resources/data/forge/tags/blocks/storage_blocks/dragonstone.json delete mode 100644 src/main/resources/data/forge/tags/blocks/storage_blocks/fyrite.json delete mode 100644 src/main/resources/data/forge/tags/blocks/storage_blocks/illumenite.json delete mode 100644 src/main/resources/data/forge/tags/blocks/storage_blocks/malachite.json delete mode 100644 src/main/resources/data/forge/tags/items/storage_blocks.json delete mode 100644 src/main/resources/data/forge/tags/items/storage_blocks/argonite.json delete mode 100644 src/main/resources/data/forge/tags/items/storage_blocks/ashstone.json delete mode 100644 src/main/resources/data/forge/tags/items/storage_blocks/dragonstone.json delete mode 100644 src/main/resources/data/forge/tags/items/storage_blocks/fyrite.json delete mode 100644 src/main/resources/data/forge/tags/items/storage_blocks/illumenite.json delete mode 100644 src/main/resources/data/forge/tags/items/storage_blocks/malachite.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/beacon_base_blocks.json delete mode 100644 src/main/resources/data/netherrocks/recipes/argonite_ingot_from_blasting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/argonite_ingot_from_smelting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_ingot_from_blasting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_ingot_from_smelting.json diff --git a/README.md b/README.md index a000484f..7a1b479a 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Forge mods. I hope I did a good job with it. TO DO ----- * [1.17.1] add missing raw metal textures. -* [1.17.1] add datagen recipes for raw_metal_blocks & smelting/blasting raw_metal. +* [1.17.1] add datagen recipes for raw_metal_blocks & smelting/blasting raw_metal. * [1.17.1] add datagen storage block tags for raw_metal blocks. * update/move wiki * Decide if we really need more detailed configs than that. diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index a49179c1..9fd48bb9 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -12,6 +12,10 @@ "netherrocks:illumenite_ore", "netherrocks:malachite_block", "netherrocks:malachite_ore", + "netherrocks:raw_argonite_block", + "netherrocks:raw_fyrite_block", + "netherrocks:raw_illumenite_block", + "netherrocks:raw_malachite_block", "netherrocks:nether_blast_furnace", "netherrocks:nether_furnace", "netherrocks:nether_smoker" diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json index c26494f7..b8f60dc3 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json @@ -6,6 +6,7 @@ "netherrocks:ashstone_block", "netherrocks:ashstone_ore", "netherrocks:dragonstone_block", - "netherrocks:dragonstone_ore" + "netherrocks:dragonstone_ore", + "netherrocks:raw_argonite_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json index 049c371a..df004614 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -6,6 +6,9 @@ "netherrocks:illumenite_block", "netherrocks:illumenite_ore", "netherrocks:malachite_block", - "netherrocks:malachite_ore" + "netherrocks:malachite_ore", + "netherrocks:raw_fyrite_block", + "netherrocks:raw_illumenite_block", + "netherrocks:raw_malachite_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dark_fyrite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dark_fyrite_block.json deleted file mode 100644 index 608bff97..00000000 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/dark_fyrite_block.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "netherrocks:dark_fyrite_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "functions": [] - } - ] -} \ No newline at end of file diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java b/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java index 97ecd40e..5790a58f 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java @@ -5,6 +5,7 @@ import mod.alexndr.netherrocks.Netherrocks; import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.simplecorelib.datagen.MiningBlockTags; +import mod.alexndr.simplecorelib.helpers.TagUtils; import net.minecraft.data.DataGenerator; import net.minecraftforge.common.data.ExistingFileHelper; @@ -18,20 +19,80 @@ public ModBlockTags(DataGenerator generatorIn, ExistingFileHelper existingFileHe @Override protected void addTags() + { +// registerOreTags(); + registerStorageBlockTags(); + registerMiningTags(); + registerBeaconTags(); + + } + + private void registerStorageBlockTags() + { + this.tag(TagUtils.forgeBlockTag("storage_blocks")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/malachite")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/fyrite")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/argonite")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/ashstone")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/dragonstone")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/illumenite")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/raw_malachite")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/raw_fyrite")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/raw_argonite")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/raw_illumenite")); + + this.tag(TagUtils.forgeBlockTag("storage_blocks/raw_argonite")) + .add(ModBlocks.raw_argonite_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/raw_fyrite")) + .add(ModBlocks.raw_fyrite_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/raw_malachite")) + .add(ModBlocks.raw_malachite_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/raw_illumenite")) + .add(ModBlocks.raw_illumenite_block.get()); + + this.tag(TagUtils.forgeBlockTag("storage_blocks/argonite")) + .add(ModBlocks.argonite_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/fyrite")) + .add(ModBlocks.fyrite_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/malachite")) + .add(ModBlocks.malachite_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/illumenite")) + .add(ModBlocks.illumenite_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/ashstone")) + .add(ModBlocks.ashstone_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/dragonstone")) + .add(ModBlocks.dragonstone_block.get()); + + } // end registerStorageBlockTags() + + private void registerMiningTags() { // do nothing; super() generates all the vanilla blocktags, and we don't want that. registerMineableTags( List.of(ModBlocks.argonite_block.get(), ModBlocks.argonite_ore.get(), ModBlocks.ashstone_block.get(), ModBlocks.ashstone_ore.get(), ModBlocks.dragonstone_block.get(), ModBlocks.dragonstone_ore.get(), ModBlocks.fyrite_block.get(), ModBlocks.illumenite_block.get(), ModBlocks.illumenite_ore.get(), ModBlocks.malachite_block.get(), ModBlocks.malachite_ore.get(), + ModBlocks.raw_argonite_block.get(), ModBlocks.raw_fyrite_block.get(), ModBlocks.raw_illumenite_block.get(), + ModBlocks.raw_malachite_block.get(), ModBlocks.nether_blast_furnace.get(), ModBlocks.nether_furnace.get(), ModBlocks.nether_smoker.get()), List.of(), // 1 List.of(ModBlocks.fyrite_block.get(), ModBlocks.fyrite_ore.get(), ModBlocks.illumenite_block.get(), - ModBlocks.illumenite_ore.get(), ModBlocks.malachite_block.get(), ModBlocks.malachite_ore.get()), // 2 + ModBlocks.illumenite_ore.get(), ModBlocks.malachite_block.get(), ModBlocks.malachite_ore.get(), + ModBlocks.raw_fyrite_block.get(), ModBlocks.raw_illumenite_block.get(), + ModBlocks.raw_malachite_block.get()), // 2 List.of(ModBlocks.argonite_block.get(), ModBlocks.argonite_ore.get(), ModBlocks.ashstone_block.get(), - ModBlocks.ashstone_ore.get(), ModBlocks.dragonstone_block.get(), ModBlocks.dragonstone_ore.get()), // 3 + ModBlocks.ashstone_ore.get(), ModBlocks.dragonstone_block.get(), ModBlocks.dragonstone_ore.get(), + ModBlocks.raw_argonite_block.get()), // 3 List.of()); // 4 } - + + private void registerBeaconTags() + { + this.tag(TagUtils.modBlockTag("minecraft", "beacon_base_blocks")) + .add(ModBlocks.argonite_block.get()) + .add(ModBlocks.fyrite_block.get()) + .add(ModBlocks.illumenite_block.get()) + .add(ModBlocks.malachite_block.get()); + } } // end class diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksDataGenerator.java b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksDataGenerator.java index 12bf50bb..fa098ec4 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksDataGenerator.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksDataGenerator.java @@ -26,6 +26,7 @@ public static void gatherData(GatherDataEvent event) DataGenerator gen = event.getGenerator(); if (event.includeServer()) { + gen.addProvider(new Recipes(gen)); gen.addProvider(new SilentsRecipes(gen)); gen.addProvider(new ModBlockTags(gen, event.getExistingFileHelper())); gen.addProvider(new ModItemTags(gen, event.getExistingFileHelper())); diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks.json b/src/main/resources/data/forge/tags/blocks/storage_blocks.json deleted file mode 100644 index b8d8212e..00000000 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:storage_blocks/malachite", - "#forge:storage_blocks/ashstone", - "#forge:storage_blocks/dragonstone", - "#forge:storage_blocks/argonite", - "#forge:storage_blocks/illumenite", - "#forge:storage_blocks/fyrite" - ] -} diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/argonite.json b/src/main/resources/data/forge/tags/blocks/storage_blocks/argonite.json deleted file mode 100644 index 32b06610..00000000 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks/argonite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:argonite_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/ashstone.json b/src/main/resources/data/forge/tags/blocks/storage_blocks/ashstone.json deleted file mode 100644 index 3cee27f9..00000000 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks/ashstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:ashstone_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/dragonstone.json b/src/main/resources/data/forge/tags/blocks/storage_blocks/dragonstone.json deleted file mode 100644 index 5902ff1b..00000000 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks/dragonstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:dragonstone_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/fyrite.json b/src/main/resources/data/forge/tags/blocks/storage_blocks/fyrite.json deleted file mode 100644 index 9b6f9914..00000000 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks/fyrite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:fyrite_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/illumenite.json b/src/main/resources/data/forge/tags/blocks/storage_blocks/illumenite.json deleted file mode 100644 index dc7e9cc5..00000000 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks/illumenite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:illumenite_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/malachite.json b/src/main/resources/data/forge/tags/blocks/storage_blocks/malachite.json deleted file mode 100644 index 84bc77cd..00000000 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks/malachite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:malachite_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks.json b/src/main/resources/data/forge/tags/items/storage_blocks.json deleted file mode 100644 index b8d8212e..00000000 --- a/src/main/resources/data/forge/tags/items/storage_blocks.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:storage_blocks/malachite", - "#forge:storage_blocks/ashstone", - "#forge:storage_blocks/dragonstone", - "#forge:storage_blocks/argonite", - "#forge:storage_blocks/illumenite", - "#forge:storage_blocks/fyrite" - ] -} diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/argonite.json b/src/main/resources/data/forge/tags/items/storage_blocks/argonite.json deleted file mode 100644 index 32b06610..00000000 --- a/src/main/resources/data/forge/tags/items/storage_blocks/argonite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:argonite_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/ashstone.json b/src/main/resources/data/forge/tags/items/storage_blocks/ashstone.json deleted file mode 100644 index 3cee27f9..00000000 --- a/src/main/resources/data/forge/tags/items/storage_blocks/ashstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:ashstone_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/dragonstone.json b/src/main/resources/data/forge/tags/items/storage_blocks/dragonstone.json deleted file mode 100644 index 5902ff1b..00000000 --- a/src/main/resources/data/forge/tags/items/storage_blocks/dragonstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:dragonstone_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/fyrite.json b/src/main/resources/data/forge/tags/items/storage_blocks/fyrite.json deleted file mode 100644 index 9b6f9914..00000000 --- a/src/main/resources/data/forge/tags/items/storage_blocks/fyrite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:fyrite_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/illumenite.json b/src/main/resources/data/forge/tags/items/storage_blocks/illumenite.json deleted file mode 100644 index dc7e9cc5..00000000 --- a/src/main/resources/data/forge/tags/items/storage_blocks/illumenite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:illumenite_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/malachite.json b/src/main/resources/data/forge/tags/items/storage_blocks/malachite.json deleted file mode 100644 index 84bc77cd..00000000 --- a/src/main/resources/data/forge/tags/items/storage_blocks/malachite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:malachite_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/beacon_base_blocks.json b/src/main/resources/data/minecraft/tags/blocks/beacon_base_blocks.json deleted file mode 100644 index 7699aecf..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/beacon_base_blocks.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:argonite_block", - "netherrocks:fyrite_block", - "netherrocks:illumenite_block", - "netherrocks:malachite_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_blasting.json b/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_blasting.json deleted file mode 100644 index 2fd6b5d6..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_blasting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "item": "netherrocks:argonite_ore" - }, - "result": "netherrocks:argonite_ingot", - "experience": 0.7, - "cookingtime": 100 -} diff --git a/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_smelting.json b/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_smelting.json deleted file mode 100644 index eacb3868..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_smelting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "netherrocks:argonite_ore" - }, - "result": "netherrocks:argonite_ingot", - "experience": 0.7, - "cookingtime": 200 -} diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting.json b/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting.json deleted file mode 100644 index b19ee9bd..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "item": "netherrocks:fyrite_ore" - }, - "result": "netherrocks:fyrite_ingot", - "experience": 0.8, - "cookingtime": 100 -} diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting.json b/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting.json deleted file mode 100644 index cd1ba838..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "netherrocks:fyrite_ore" - }, - "result": "netherrocks:fyrite_ingot", - "experience": 0.8, - "cookingtime": 200 -} diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting.json b/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting.json deleted file mode 100644 index 29eb3580..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "item": "netherrocks:illumenite_ore" - }, - "result": "netherrocks:illumenite_ingot", - "experience": 0.8, - "cookingtime": 100 -} diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting.json b/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting.json deleted file mode 100644 index 77c2a92b..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "netherrocks:illumenite_ore" - }, - "result": "netherrocks:illumenite_ingot", - "experience": 0.8, - "cookingtime": 200 -} diff --git a/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_blasting.json b/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_blasting.json deleted file mode 100644 index f2055643..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_blasting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "item": "netherrocks:malachite_ore" - }, - "result": "netherrocks:malachite_ingot", - "experience": 0.5, - "cookingtime": 100 -} diff --git a/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_smelting.json b/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_smelting.json deleted file mode 100644 index 9c4946be..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_smelting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "netherrocks:malachite_ore" - }, - "result": "netherrocks:malachite_ingot", - "experience": 0.5, - "cookingtime": 200 -} From b8cf207f4433ee2e098c3b2b554fcbdff7c5d1ef Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sun, 22 Aug 2021 09:02:38 -0500 Subject: [PATCH 20/56] added recipe datagen, and all new generated jsons --- .../forge/tags/blocks/storage_blocks.json | 15 ++++ .../tags/blocks/storage_blocks/argonite.json | 6 ++ .../tags/blocks/storage_blocks/ashstone.json | 6 ++ .../blocks/storage_blocks/dragonstone.json | 6 ++ .../tags/blocks/storage_blocks/fyrite.json | 6 ++ .../blocks/storage_blocks/illumenite.json | 6 ++ .../tags/blocks/storage_blocks/malachite.json | 6 ++ .../blocks/storage_blocks/raw_argonite.json | 6 ++ .../blocks/storage_blocks/raw_fyrite.json | 6 ++ .../blocks/storage_blocks/raw_illumenite.json | 6 ++ .../blocks/storage_blocks/raw_malachite.json | 6 ++ .../tags/blocks/beacon_base_blocks.json | 9 +++ .../argonite_ingot_from_blasting.json | 34 +++++++++ ...argonite_ingot_from_blasting_from_ore.json | 34 +++++++++ .../argonite_ingot_from_smelting.json | 34 +++++++++ ...argonite_ingot_from_smelting_from_ore.json | 34 +++++++++ .../fyrite_ingot_from_blasting.json | 34 +++++++++ .../fyrite_ingot_from_blasting_from_ore.json | 34 +++++++++ .../fyrite_ingot_from_smelting.json | 34 +++++++++ .../fyrite_ingot_from_smelting_from_ore.json | 34 +++++++++ .../illumenite_ingot_from_blasting.json | 34 +++++++++ ...lumenite_ingot_from_blasting_from_ore.json | 34 +++++++++ .../illumenite_ingot_from_smelting.json | 34 +++++++++ ...lumenite_ingot_from_smelting_from_ore.json | 34 +++++++++ .../malachite_ingot_from_blasting.json | 34 +++++++++ ...alachite_ingot_from_blasting_from_ore.json | 34 +++++++++ .../malachite_ingot_from_smelting.json | 34 +++++++++ ...alachite_ingot_from_smelting_from_ore.json | 34 +++++++++ .../recipes/netherrocks/raw_argonite.json | 34 +++++++++ .../netherrocks/raw_argonite_block.json | 34 +++++++++ .../recipes/netherrocks/raw_fyrite.json | 34 +++++++++ .../recipes/netherrocks/raw_fyrite_block.json | 34 +++++++++ .../recipes/netherrocks/raw_illumenite.json | 34 +++++++++ .../netherrocks/raw_illumenite_block.json | 34 +++++++++ .../recipes/netherrocks/raw_malachite.json | 34 +++++++++ .../netherrocks/raw_malachite_block.json | 34 +++++++++ .../recipes/argonite_ingot_from_blasting.json | 9 +++ ...argonite_ingot_from_blasting_from_ore.json | 9 +++ .../recipes/argonite_ingot_from_smelting.json | 9 +++ ...argonite_ingot_from_smelting_from_ore.json | 9 +++ .../recipes/fyrite_ingot_from_blasting.json | 9 +++ .../fyrite_ingot_from_blasting_from_ore.json | 9 +++ .../recipes/fyrite_ingot_from_smelting.json | 9 +++ .../fyrite_ingot_from_smelting_from_ore.json | 9 +++ .../illumenite_ingot_from_blasting.json | 9 +++ ...lumenite_ingot_from_blasting_from_ore.json | 9 +++ .../illumenite_ingot_from_smelting.json | 9 +++ ...lumenite_ingot_from_smelting_from_ore.json | 9 +++ .../malachite_ingot_from_blasting.json | 9 +++ ...alachite_ingot_from_blasting_from_ore.json | 9 +++ .../malachite_ingot_from_smelting.json | 9 +++ ...alachite_ingot_from_smelting_from_ore.json | 9 +++ .../netherrocks/recipes/raw_argonite.json | 12 +++ .../recipes/raw_argonite_block.json | 16 ++++ .../data/netherrocks/recipes/raw_fyrite.json | 12 +++ .../netherrocks/recipes/raw_fyrite_block.json | 16 ++++ .../netherrocks/recipes/raw_illumenite.json | 12 +++ .../recipes/raw_illumenite_block.json | 16 ++++ .../netherrocks/recipes/raw_malachite.json | 12 +++ .../recipes/raw_malachite_block.json | 16 ++++ .../alexndr/netherrocks/datagen/Recipes.java | 76 +++++++++++++++++++ 61 files changed, 1232 insertions(+) create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/argonite.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/ashstone.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/dragonstone.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/fyrite.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/illumenite.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/malachite.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_argonite.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_fyrite.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_illumenite.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_malachite.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_argonite.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_argonite_block.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_fyrite.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_fyrite_block.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_illumenite.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_illumenite_block.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_malachite.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_malachite_block.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_blasting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_smelting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_blasting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_smelting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/recipes/raw_argonite.json create mode 100644 src/generated/resources/data/netherrocks/recipes/raw_argonite_block.json create mode 100644 src/generated/resources/data/netherrocks/recipes/raw_fyrite.json create mode 100644 src/generated/resources/data/netherrocks/recipes/raw_fyrite_block.json create mode 100644 src/generated/resources/data/netherrocks/recipes/raw_illumenite.json create mode 100644 src/generated/resources/data/netherrocks/recipes/raw_illumenite_block.json create mode 100644 src/generated/resources/data/netherrocks/recipes/raw_malachite.json create mode 100644 src/generated/resources/data/netherrocks/recipes/raw_malachite_block.json create mode 100644 src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json new file mode 100644 index 00000000..4f7198e7 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "#forge:storage_blocks/malachite", + "#forge:storage_blocks/fyrite", + "#forge:storage_blocks/argonite", + "#forge:storage_blocks/ashstone", + "#forge:storage_blocks/dragonstone", + "#forge:storage_blocks/illumenite", + "#forge:storage_blocks/raw_malachite", + "#forge:storage_blocks/raw_fyrite", + "#forge:storage_blocks/raw_argonite", + "#forge:storage_blocks/raw_illumenite" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/argonite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/argonite.json new file mode 100644 index 00000000..32b06610 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/argonite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/ashstone.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/ashstone.json new file mode 100644 index 00000000..3cee27f9 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/ashstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "netherrocks:ashstone_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/dragonstone.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/dragonstone.json new file mode 100644 index 00000000..5902ff1b --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/dragonstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "netherrocks:dragonstone_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/fyrite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/fyrite.json new file mode 100644 index 00000000..9b6f9914 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/fyrite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "netherrocks:fyrite_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/illumenite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/illumenite.json new file mode 100644 index 00000000..dc7e9cc5 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/illumenite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "netherrocks:illumenite_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/malachite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/malachite.json new file mode 100644 index 00000000..84bc77cd --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/malachite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "netherrocks:malachite_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_argonite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_argonite.json new file mode 100644 index 00000000..d1186866 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_argonite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "netherrocks:raw_argonite_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_fyrite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_fyrite.json new file mode 100644 index 00000000..132029cf --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_fyrite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "netherrocks:raw_fyrite_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_illumenite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_illumenite.json new file mode 100644 index 00000000..9d1477ac --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_illumenite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "netherrocks:raw_illumenite_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_malachite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_malachite.json new file mode 100644 index 00000000..33b13b67 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_malachite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "netherrocks:raw_malachite_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json b/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json new file mode 100644 index 00000000..a1ef691f --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_block", + "netherrocks:fyrite_block", + "netherrocks:illumenite_block", + "netherrocks:malachite_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting.json new file mode 100644 index 00000000..7763b231 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_ingot_from_blasting" + ] + }, + "criteria": { + "argonite_ingot_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_argonite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_ingot_from_blasting" + } + } + }, + "requirements": [ + [ + "argonite_ingot_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..0770024d --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_ingot_from_blasting_from_ore" + ] + }, + "criteria": { + "argonite_ingot_from_blasting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_ingot_from_blasting_from_ore" + } + } + }, + "requirements": [ + [ + "argonite_ingot_from_blasting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting.json new file mode 100644 index 00000000..943995d2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_ingot_from_smelting" + ] + }, + "criteria": { + "argonite_ingot_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_argonite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_ingot_from_smelting" + } + } + }, + "requirements": [ + [ + "argonite_ingot_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..07cbd0e2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_ingot_from_smelting_from_ore" + ] + }, + "criteria": { + "argonite_ingot_from_smelting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_ingot_from_smelting_from_ore" + } + } + }, + "requirements": [ + [ + "argonite_ingot_from_smelting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting.json new file mode 100644 index 00000000..1fe19083 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_ingot_from_blasting" + ] + }, + "criteria": { + "fyrite_ingot_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_fyrite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_ingot_from_blasting" + } + } + }, + "requirements": [ + [ + "fyrite_ingot_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..bcefa15e --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_ingot_from_blasting_from_ore" + ] + }, + "criteria": { + "fyrite_ingot_from_blasting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_ingot_from_blasting_from_ore" + } + } + }, + "requirements": [ + [ + "fyrite_ingot_from_blasting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting.json new file mode 100644 index 00000000..78a0b602 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_ingot_from_smelting" + ] + }, + "criteria": { + "fyrite_ingot_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_fyrite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_ingot_from_smelting" + } + } + }, + "requirements": [ + [ + "fyrite_ingot_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..403c1a2a --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_ingot_from_smelting_from_ore" + ] + }, + "criteria": { + "fyrite_ingot_from_smelting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_ingot_from_smelting_from_ore" + } + } + }, + "requirements": [ + [ + "fyrite_ingot_from_smelting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting.json new file mode 100644 index 00000000..ebe2bb13 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_ingot_from_blasting" + ] + }, + "criteria": { + "illumenite_ingot_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_illumenite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_ingot_from_blasting" + } + } + }, + "requirements": [ + [ + "illumenite_ingot_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..efee6ddc --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_ingot_from_blasting_from_ore" + ] + }, + "criteria": { + "illumenite_ingot_from_blasting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_ingot_from_blasting_from_ore" + } + } + }, + "requirements": [ + [ + "illumenite_ingot_from_blasting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting.json new file mode 100644 index 00000000..8a71ee53 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_ingot_from_smelting" + ] + }, + "criteria": { + "illumenite_ingot_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_illumenite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_ingot_from_smelting" + } + } + }, + "requirements": [ + [ + "illumenite_ingot_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..15352fa6 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_ingot_from_smelting_from_ore" + ] + }, + "criteria": { + "illumenite_ingot_from_smelting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_ingot_from_smelting_from_ore" + } + } + }, + "requirements": [ + [ + "illumenite_ingot_from_smelting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting.json new file mode 100644 index 00000000..2d84465c --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_ingot_from_blasting" + ] + }, + "criteria": { + "malachite_ingot_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_malachite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_ingot_from_blasting" + } + } + }, + "requirements": [ + [ + "malachite_ingot_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..8161e00f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_ingot_from_blasting_from_ore" + ] + }, + "criteria": { + "malachite_ingot_from_blasting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_ingot_from_blasting_from_ore" + } + } + }, + "requirements": [ + [ + "malachite_ingot_from_blasting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting.json new file mode 100644 index 00000000..0b72f8ff --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_ingot_from_smelting" + ] + }, + "criteria": { + "malachite_ingot_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_malachite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_ingot_from_smelting" + } + } + }, + "requirements": [ + [ + "malachite_ingot_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..ee435238 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_ingot_from_smelting_from_ore" + ] + }, + "criteria": { + "malachite_ingot_from_smelting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_ingot_from_smelting_from_ore" + } + } + }, + "requirements": [ + [ + "malachite_ingot_from_smelting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_argonite.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_argonite.json new file mode 100644 index 00000000..7085ae15 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_argonite.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_argonite" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_argonite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_argonite" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_argonite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_argonite_block.json new file mode 100644 index 00000000..68053d76 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_argonite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_argonite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_argonite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_argonite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_fyrite.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_fyrite.json new file mode 100644 index 00000000..48e72648 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_fyrite.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_fyrite" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_fyrite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_fyrite" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_fyrite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_fyrite_block.json new file mode 100644 index 00000000..ff89fe4c --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_fyrite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_fyrite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_fyrite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_fyrite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_illumenite.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_illumenite.json new file mode 100644 index 00000000..ff2233f8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_illumenite.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_illumenite" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_illumenite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_illumenite" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_illumenite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_illumenite_block.json new file mode 100644 index 00000000..756df658 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_illumenite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_illumenite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_illumenite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_illumenite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_malachite.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_malachite.json new file mode 100644 index 00000000..84d5888c --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_malachite.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_malachite" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_malachite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_malachite" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_malachite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_malachite_block.json new file mode 100644 index 00000000..e271584a --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_malachite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_malachite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_malachite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_malachite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_blasting.json new file mode 100644 index 00000000..e9b9fc10 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:raw_argonite" + }, + "result": "netherrocks:argonite_ingot", + "experience": 0.7, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..a3108d4b --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_blasting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:argonite_ore" + }, + "result": "netherrocks:argonite_ingot", + "experience": 0.7, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_smelting.json new file mode 100644 index 00000000..aeffb687 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_smelting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:raw_argonite" + }, + "result": "netherrocks:argonite_ingot", + "experience": 0.7, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..329b8a6b --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_smelting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:argonite_ore" + }, + "result": "netherrocks:argonite_ingot", + "experience": 0.7, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting.json new file mode 100644 index 00000000..90eb2c49 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:raw_fyrite" + }, + "result": "netherrocks:fyrite_ingot", + "experience": 0.8, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..c807f0b2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:fyrite_ore" + }, + "result": "netherrocks:fyrite_ingot", + "experience": 0.8, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting.json new file mode 100644 index 00000000..950dfdaa --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:raw_fyrite" + }, + "result": "netherrocks:fyrite_ingot", + "experience": 0.8, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..671690c1 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:fyrite_ore" + }, + "result": "netherrocks:fyrite_ingot", + "experience": 0.8, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting.json new file mode 100644 index 00000000..1d9ec3cb --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:raw_illumenite" + }, + "result": "netherrocks:illumenite_ingot", + "experience": 0.8, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..758b5de2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:illumenite_ore" + }, + "result": "netherrocks:illumenite_ingot", + "experience": 0.8, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting.json new file mode 100644 index 00000000..2c4d3768 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:raw_illumenite" + }, + "result": "netherrocks:illumenite_ingot", + "experience": 0.8, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..db0534c9 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:illumenite_ore" + }, + "result": "netherrocks:illumenite_ingot", + "experience": 0.8, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_blasting.json new file mode 100644 index 00000000..f0b0c425 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:raw_malachite" + }, + "result": "netherrocks:malachite_ingot", + "experience": 0.5, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..75c6193a --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_blasting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:malachite_ore" + }, + "result": "netherrocks:malachite_ingot", + "experience": 0.5, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_smelting.json new file mode 100644 index 00000000..1c8f1115 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_smelting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:raw_malachite" + }, + "result": "netherrocks:malachite_ingot", + "experience": 0.5, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..df4d2eb3 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_smelting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:malachite_ore" + }, + "result": "netherrocks:malachite_ingot", + "experience": 0.5, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_argonite.json b/src/generated/resources/data/netherrocks/recipes/raw_argonite.json new file mode 100644 index 00000000..ad5c6a93 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_argonite.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:raw_argonite_block" + } + ], + "result": { + "item": "netherrocks:raw_argonite", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_argonite_block.json b/src/generated/resources/data/netherrocks/recipes/raw_argonite_block.json new file mode 100644 index 00000000..d9dcb8ec --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_argonite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:raw_argonite" + } + }, + "result": { + "item": "netherrocks:raw_argonite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_fyrite.json b/src/generated/resources/data/netherrocks/recipes/raw_fyrite.json new file mode 100644 index 00000000..fc67a8e1 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_fyrite.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:raw_fyrite_block" + } + ], + "result": { + "item": "netherrocks:raw_fyrite", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_fyrite_block.json b/src/generated/resources/data/netherrocks/recipes/raw_fyrite_block.json new file mode 100644 index 00000000..18b9c005 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_fyrite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:raw_fyrite" + } + }, + "result": { + "item": "netherrocks:raw_fyrite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_illumenite.json b/src/generated/resources/data/netherrocks/recipes/raw_illumenite.json new file mode 100644 index 00000000..bfe025bc --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_illumenite.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:raw_illumenite_block" + } + ], + "result": { + "item": "netherrocks:raw_illumenite", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_illumenite_block.json b/src/generated/resources/data/netherrocks/recipes/raw_illumenite_block.json new file mode 100644 index 00000000..7ba73ee7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_illumenite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:raw_illumenite" + } + }, + "result": { + "item": "netherrocks:raw_illumenite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_malachite.json b/src/generated/resources/data/netherrocks/recipes/raw_malachite.json new file mode 100644 index 00000000..beecf50f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_malachite.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:raw_malachite_block" + } + ], + "result": { + "item": "netherrocks:raw_malachite", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_malachite_block.json b/src/generated/resources/data/netherrocks/recipes/raw_malachite_block.json new file mode 100644 index 00000000..a677f704 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_malachite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:raw_malachite" + } + }, + "result": { + "item": "netherrocks:raw_malachite_block" + } +} \ No newline at end of file diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java b/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java new file mode 100644 index 00000000..8a7f6b0f --- /dev/null +++ b/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java @@ -0,0 +1,76 @@ +package mod.alexndr.netherrocks.datagen; + +import java.util.function.Consumer; + +import mod.alexndr.netherrocks.Netherrocks; +import mod.alexndr.netherrocks.config.NetherrocksConfig; +import mod.alexndr.netherrocks.init.ModItems; +import mod.alexndr.netherrocks.init.ModBlocks; +import mod.alexndr.simplecorelib.datagen.ISimpleConditionBuilder; +import mod.alexndr.simplecorelib.datagen.RecipeSetBuilder; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraftforge.common.crafting.conditions.ICondition; +import net.minecraftforge.common.crafting.conditions.IConditionBuilder; + +public class Recipes extends RecipeProvider implements IConditionBuilder, ISimpleConditionBuilder +{ + private RecipeSetBuilder setbuilder; + + public Recipes(DataGenerator generatorIn) + { + super(generatorIn); + setbuilder = new RecipeSetBuilder(Netherrocks.MODID); + } + + protected void buildCraftingRecipes(Consumer consumer) + { + registerStorageRecipes(consumer); +// registerMiscRecipes(consumer); +// registerToolRecipes(consumer); +// registerArmorRecipes(consumer); + registerFurnaceRecipes(consumer); + } // end registerRecipes() + + protected void registerStorageRecipes(Consumer consumer) + { + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.raw_fyrite.get(), + ModBlocks.raw_fyrite_block.get(), null, has(ModItems.raw_fyrite.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.raw_illumenite.get(), + ModBlocks.raw_illumenite_block.get(), null, has(ModItems.raw_illumenite.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.raw_argonite.get(), + ModBlocks.raw_argonite_block.get(), null, has(ModItems.raw_argonite.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.raw_malachite.get(), + ModBlocks.raw_malachite_block.get(), null, has(ModItems.raw_malachite.get())); + } + + protected void registerFurnaceRecipes(Consumer consumer) + { + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModItems.raw_fyrite.get()), ModItems.fyrite_ingot.get(), + has(ModItems.raw_fyrite.get()), 0.8F, 200); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModItems.raw_illumenite.get()), ModItems.illumenite_ingot.get(), + has(ModItems.raw_illumenite.get()), 0.8F, 200); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModItems.raw_argonite.get()), ModItems.argonite_ingot.get(), + has(ModItems.raw_argonite.get()), 0.7F, 200); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModItems.raw_malachite.get()), ModItems.malachite_ingot.get(), + has(ModItems.raw_malachite.get()), 0.5F, 200); + + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.fyrite_ore.get()), ModItems.fyrite_ingot.get(), + has(ModBlocks.fyrite_ore.get()), 0.8F, 200, "_from_ore"); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.illumenite_ore.get()), ModItems.illumenite_ingot.get(), + has(ModBlocks.illumenite_ore.get()), 0.8F, 200, "_from_ore"); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.argonite_ore.get()), ModItems.argonite_ingot.get(), + has(ModBlocks.argonite_ore.get()), 0.7F, 200, "_from_ore"); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.malachite_ore.get()), ModItems.malachite_ingot.get(), + has(ModBlocks.malachite_ore.get()), 0.5F, 200, "_from_ore"); + } + + @Override + public ICondition flag(String arg0) + { + return impl_flag(Netherrocks.MODID, NetherrocksConfig.INSTANCE, arg0); + } + +} // end class From 004634413163b77b65326845ec72853cdbc33964 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sun, 22 Aug 2021 11:07:32 -0500 Subject: [PATCH 21/56] tweaked block hardnesses to be more inline with modern values; tweaked tool stats likewise --- README.md | 2 +- .../java/mod/alexndr/netherrocks/init/ModBlocks.java | 4 ++-- .../java/mod/alexndr/netherrocks/init/ModItems.java | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 7a1b479a..f5f602d3 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ TO DO ----- * [1.17.1] add missing raw metal textures. * [1.17.1] add datagen recipes for raw_metal_blocks & smelting/blasting raw_metal. -* [1.17.1] add datagen storage block tags for raw_metal blocks. +* [1.17.1] add datagen storage block tags for raw_metal blocks. * update/move wiki * Decide if we really need more detailed configs than that. * Add shears for all metals. diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java b/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java index 331cbc63..9ee1d8a7 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java @@ -57,10 +57,10 @@ public final class ModBlocks // Metal Blocks public static final RegistryObject ashstone_block = BLOCKS.register("ashstone_block", () -> new Block(Block.Properties.of(Material.STONE) - .strength(7.0F, 72.0F).requiresCorrectToolForDrops())); + .strength(7.0F, 1200.0F).requiresCorrectToolForDrops())); public static final RegistryObject dragonstone_block = BLOCKS.register("dragonstone_block", () -> new Block(Block.Properties.of(Material.STONE, MaterialColor.NETHER) - .strength(10.0F, 72.0F).requiresCorrectToolForDrops())); + .strength(10.0F, 1200.0F).requiresCorrectToolForDrops())); public static final RegistryObject argonite_block = BLOCKS.register("argonite_block", () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.COLOR_BLUE) .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModItems.java b/src/main/java/mod/alexndr/netherrocks/init/ModItems.java index 0acbeddd..a0afd9e8 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModItems.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModItems.java @@ -132,19 +132,19 @@ public final class ModItems // axes public static final RegistryObject argonite_axe = ITEMS.register("argonite_axe", - () -> new AxeItem(NetherrocksItemTiers.ARGONITE, 7.0F, -3.1F, + () -> new AxeItem(NetherrocksItemTiers.ARGONITE, 5.0F, -3.1F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_axe = ITEMS.register("fyrite_axe", - () -> new FyriteAxeItem(NetherrocksItemTiers.FYRITE, 7.0F, -3.1F, + () -> new FyriteAxeItem(NetherrocksItemTiers.FYRITE, 5.0F, -3.1F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_axe = ITEMS.register("malachite_axe", - () -> new MalachiteAxeItem(NetherrocksItemTiers.MALACHITE, 7.0F, -3.1F, + () -> new MalachiteAxeItem(NetherrocksItemTiers.MALACHITE, 5.0F, -3.1F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject ashstone_axe = ITEMS.register("ashstone_axe", - () -> new AxeItem(NetherrocksItemTiers.ASHSTONE, 7.0F, -3.1F, + () -> new AxeItem(NetherrocksItemTiers.ASHSTONE, 6.0F, -3.1F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_axe = ITEMS.register("dragonstone_axe", - () -> new AxeItem(NetherrocksItemTiers.DRAGONSTONE, 7.0F, -3.1F, + () -> new AxeItem(NetherrocksItemTiers.DRAGONSTONE, 1.0F, -3.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // shovels From b29f5be5842a70c47eab7751f9e70487a13c1ae9 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Mon, 23 Aug 2021 10:46:31 -0500 Subject: [PATCH 22/56] update.json now has 1.17.1 fields --- update.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/update.json b/update.json index b805fb6d..5a4af9a5 100644 --- a/update.json +++ b/update.json @@ -22,6 +22,8 @@ "1.16.4-latest" : "1.16.4-2.3.3.2", "1.16.4-recommended" : "1.16.4-2.3.3.2", "1.16.5-latest" : "1.16.5-2.3.6.5", - "1.16.5-recommended" : "1.16.5-2.3.6.4" + "1.16.5-recommended" : "1.16.5-2.3.6.4", + "1.17.1-latest" : "1.17.1-3.0.0.0", + "1.17.1-recommended" : "1.17.1-3.0.0.1" } } From b3a8829efc839cc4a0761c892a4c73f22532d62b Mon Sep 17 00:00:00 2001 From: Sinhika Date: Mon, 23 Aug 2021 16:14:37 -0500 Subject: [PATCH 23/56] added JEI support back in (WIP -- still needs nether furnace fuel support). Fixed cut&paste error in furnace blocks that kept menus from opening --- build.gradle | 30 +++++++++---------- gradle.properties | 8 ++--- .../client/jei/JEIMachinePlugin.java | 29 +++++++++++++++++- .../content/NetherBlastFurnaceBlock.java | 3 +- .../content/NetherFurnaceBlock.java | 3 +- .../content/NetherSmokerBlock.java | 3 +- 6 files changed, 50 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index 378e7920..36a78a7a 100644 --- a/build.gradle +++ b/build.gradle @@ -122,24 +122,24 @@ repositories { name = "CurseForge" url = "https://minecraft.curseforge.com/api/maven/" } -// maven { -// // location of the maven that hosts JEI files -// name = "Progwml6 maven" -// url = "https://dvs1.progwml6.com/files/maven/" -// } -// maven { -// // location of a maven mirror for JEI files, as a fallback -// name = "ModMaven" -// url = "https://modmaven.k-4u.nl" -// } + maven { + // location of the maven that hosts JEI files + name = "Progwml6 maven" + url = "https://dvs1.progwml6.com/files/maven/" + } + maven { + // location of a maven mirror for JEI files, as a fallback + name = "ModMaven" + url = "https://modmaven.k-4u.nl" + } } // Include resources generated by data generators. sourceSets.main.resources { srcDir 'src/generated/resources' } -sourceSets.main.java { - exclude 'mod/alexndr/netherrocks/client/jei/**' -} +// sourceSets.main.java { +// exclude 'mod/alexndr/netherrocks/client/jei/**' +// } dependencies { // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed @@ -148,9 +148,9 @@ dependencies { minecraft "net.minecraftforge:forge:${version_forge}" implementation fg.deobf("simplecore-api:SimpleCoreLib:${simplecorelib_version}") // compile against the JEI API but do not include it at runtime - // compileOnly fg.deobf("mezz.jei:jei-${version_mcjei}:${jei_version}:api") + compileOnly fg.deobf("mezz.jei:jei-${version_mcjei}:${jei_version}:api") // at runtime, use the full JEI jar - // runtimeOnly fg.deobf("mezz.jei:jei-${version_mcjei}:${jei_version}") + runtimeOnly fg.deobf("mezz.jei:jei-${version_mcjei}:${jei_version}") } // Example for how to get properties into the manifest for reading by the runtime.. diff --git a/gradle.properties b/gradle.properties index e133de83..5461c6ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,11 +6,11 @@ org.gradle.java.home=/usr/lib/jvm/adoptopenjdk-16-hotspot-amd64 # general version_minecraft = 1.17.1 -version_forge = 1.17.1-37.0.40 +version_forge = 1.17.1-37.0.43 # Simple Ores: Netherrocks version_mod = 3.0.0 -simplecorelib_version = 1.17.1-3.0.0.7 +simplecorelib_version = 1.17.1-3.0.0.8 simpleores_version = 1.17.1-3.0.0.1 -version_mcjei = 1.16.5 -jei_version = 7.6.4.90 +version_mcjei = 1.17.1 +jei_version = 8.0.0.12 diff --git a/src/main/java/mod/alexndr/netherrocks/client/jei/JEIMachinePlugin.java b/src/main/java/mod/alexndr/netherrocks/client/jei/JEIMachinePlugin.java index f70ad37e..d67fe5fa 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/jei/JEIMachinePlugin.java +++ b/src/main/java/mod/alexndr/netherrocks/client/jei/JEIMachinePlugin.java @@ -3,11 +3,19 @@ import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.VanillaRecipeCategoryUid; +import mezz.jei.api.registration.IGuiHandlerRegistration; import mezz.jei.api.registration.IRecipeCatalystRegistration; +import mezz.jei.api.registration.IRecipeTransferRegistration; import mod.alexndr.netherrocks.Netherrocks; +import mod.alexndr.netherrocks.client.gui.NetherBlastFurnaceScreen; +import mod.alexndr.netherrocks.client.gui.NetherFurnaceScreen; +import mod.alexndr.netherrocks.client.gui.NetherSmokerScreen; +import mod.alexndr.netherrocks.content.NetherBlastFurnaceContainer; +import mod.alexndr.netherrocks.content.NetherFurnaceContainer; +import mod.alexndr.netherrocks.content.NetherSmokerContainer; import mod.alexndr.netherrocks.init.ModBlocks; -import net.minecraft.world.item.ItemStack; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ItemStack; @JeiPlugin public class JEIMachinePlugin implements IModPlugin @@ -31,6 +39,25 @@ public void registerRecipeCatalysts(IRecipeCatalystRegistration registry) } @Override + public void registerRecipeTransferHandlers(IRecipeTransferRegistration registration) + { + registration.addRecipeTransferHandler(NetherFurnaceContainer.class, VanillaRecipeCategoryUid.FURNACE, 0, 1, 3, 36); + //registration.addRecipeTransferHandler(NetherFurnaceContainer.class, VanillaRecipeCategoryUid.FUEL, 1, 1, 3, 36); + registration.addRecipeTransferHandler(NetherSmokerContainer.class, VanillaRecipeCategoryUid.SMOKING, 0, 1, 3, 36); + //registration.addRecipeTransferHandler(NetherSmokerContainer.class, VanillaRecipeCategoryUid.FUEL, 1, 1, 3, 36); + registration.addRecipeTransferHandler(NetherBlastFurnaceContainer.class, VanillaRecipeCategoryUid.BLASTING, 0, 1, 3, 36); + //registration.addRecipeTransferHandler(NetherBlastFurnaceContainer.class, VanillaRecipeCategoryUid.FUEL, 1, 1, 3, 36); + } + + @Override + public void registerGuiHandlers(IGuiHandlerRegistration registration) + { + registration.addRecipeClickArea(NetherFurnaceScreen.class, 78, 32, 28, 23, VanillaRecipeCategoryUid.FURNACE); + registration.addRecipeClickArea(NetherSmokerScreen.class, 78, 32, 28, 23, VanillaRecipeCategoryUid.SMOKING); + registration.addRecipeClickArea(NetherBlastFurnaceScreen.class, 78, 32, 28, 23, VanillaRecipeCategoryUid.BLASTING); + } + + @Override public ResourceLocation getPluginUid() { return ID; diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java index 1bd6dd76..8551d0a9 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java @@ -2,7 +2,6 @@ import mod.alexndr.netherrocks.api.content.AbstractNetherBlastFurnaceBlock; import mod.alexndr.netherrocks.init.ModTiles; -import mod.alexndr.simplecorelib.content.TestFurnaceTileEntity; import net.minecraft.core.BlockPos; import net.minecraft.stats.Stats; import net.minecraft.world.Containers; @@ -51,7 +50,7 @@ public BlockEntityTicker getTicker(Level level, Block @Override public BlockEntity newBlockEntity(BlockPos bpos, BlockState bstate) { - return new TestFurnaceTileEntity(bpos, bstate); + return new NetherBlastFurnaceTileEntity(bpos, bstate); } diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java index 29e6800f..f4f999b2 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java @@ -1,7 +1,6 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.init.ModTiles; -import mod.alexndr.simplecorelib.content.TestFurnaceTileEntity; import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceBlock; import net.minecraft.core.BlockPos; import net.minecraft.stats.Stats; @@ -58,7 +57,7 @@ public BlockEntityTicker getTicker(Level level, Block @Override public BlockEntity newBlockEntity(BlockPos bpos, BlockState bstate) { - return new TestFurnaceTileEntity(bpos, bstate); + return new NetherFurnaceTileEntity(bpos, bstate); } diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerBlock.java b/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerBlock.java index 64a8803d..77c65ec3 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerBlock.java @@ -2,7 +2,6 @@ import mod.alexndr.netherrocks.api.content.AbstractNetherSmokerBlock; import mod.alexndr.netherrocks.init.ModTiles; -import mod.alexndr.simplecorelib.content.TestFurnaceTileEntity; import net.minecraft.core.BlockPos; import net.minecraft.stats.Stats; import net.minecraft.world.Containers; @@ -52,7 +51,7 @@ public BlockEntityTicker getTicker(Level level, Block @Override public BlockEntity newBlockEntity(BlockPos bpos, BlockState bstate) { - return new TestFurnaceTileEntity(bpos, bstate); + return new NetherSmokerTileEntity(bpos, bstate); } From a1c00ff44f4aabe42aeb1a585ac12276e7bf3fd9 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Mon, 23 Aug 2021 20:06:57 -0500 Subject: [PATCH 24/56] implemented nether furnace fuel in JEI. WIP; icon is wrong --- .../AbstractNetherFurnaceTileEntity.java | 2 +- .../api/jei/AlternateFuelRecipe.java | 55 +++++++++ .../netherrocks/api/jei/IconDrawable.java | 112 +++++++++++++++++ .../VeryAbstractFurnaceVariantCategory.java | 34 ++++++ .../client/jei/JEIMachinePlugin.java | 41 ++++++- .../client/jei/NetherFuelCategory.java | 113 ++++++++++++++++++ .../client/jei/NetherFuelRecipeMaker.java | 52 ++++++++ .../assets/netherrocks/lang/en_us.json | 5 +- .../assets/netherrocks/textures/gui/flame.png | Bin 0 -> 192 bytes .../netherrocks/textures/gui/gui_vanilla.png | Bin 0 -> 9709 bytes 10 files changed, 406 insertions(+), 8 deletions(-) create mode 100644 src/main/java/mod/alexndr/netherrocks/api/jei/AlternateFuelRecipe.java create mode 100644 src/main/java/mod/alexndr/netherrocks/api/jei/IconDrawable.java create mode 100644 src/main/java/mod/alexndr/netherrocks/api/jei/VeryAbstractFurnaceVariantCategory.java create mode 100644 src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java create mode 100644 src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelRecipeMaker.java create mode 100644 src/main/resources/assets/netherrocks/textures/gui/flame.png create mode 100644 src/main/resources/assets/netherrocks/textures/gui/gui_vanilla.png diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java index 8f58eef9..30b2e40c 100644 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java +++ b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java @@ -102,7 +102,7 @@ protected static void addItemTagBurnTime(Map map, Tag iTag, * @param recipeType - ignored * @return burn time in ticks. */ - protected static int getBurnTime(ItemStack stack, @Nullable RecipeType recipeType) + public static int getBurnTime(ItemStack stack, @Nullable RecipeType recipeType) { if (AbstractNetherFurnaceTileEntity.burnTimes.isEmpty()) { AbstractNetherFurnaceTileEntity.burnTimes = AbstractNetherFurnaceTileEntity.loadBurnTimes(); diff --git a/src/main/java/mod/alexndr/netherrocks/api/jei/AlternateFuelRecipe.java b/src/main/java/mod/alexndr/netherrocks/api/jei/AlternateFuelRecipe.java new file mode 100644 index 00000000..0ba5fe80 --- /dev/null +++ b/src/main/java/mod/alexndr/netherrocks/api/jei/AlternateFuelRecipe.java @@ -0,0 +1,55 @@ +package mod.alexndr.netherrocks.api.jei; + +import java.text.NumberFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import com.google.common.base.Preconditions; + +import mezz.jei.api.gui.drawable.IDrawableAnimated; +import mezz.jei.api.helpers.IGuiHelper; +import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceTileEntity; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.item.ItemStack; + +public class AlternateFuelRecipe +{ + private final List inputs; + private final Component smeltCountText; + private final IDrawableAnimated flame; + + + public AlternateFuelRecipe(IGuiHelper guiHelper, Collection input, int burnTime) + { + Preconditions.checkArgument(burnTime > 0, "burn time must be greater than 0"); + this.inputs = new ArrayList<>(input); + this.smeltCountText = createSmeltCountText(burnTime); + this.flame = guiHelper.drawableBuilder(VeryAbstractFurnaceVariantCategory.RECIPE_GUI_VANILLA, 82, 114, 14, 14) + .buildAnimated(burnTime, IDrawableAnimated.StartDirection.TOP, true); + } + + public List getInputs() { + return inputs; + } + + public Component getSmeltCountText() { + return smeltCountText; + } + + public IDrawableAnimated getFlame() { + return flame; + } + + public static Component createSmeltCountText(int burnTime) { + if (burnTime == VeryAbstractFurnaceTileEntity.BURN_TIME_STANDARD) { + return new TranslatableComponent("gui.jei.category.fuel.smeltCount.single"); + } else { + NumberFormat numberInstance = NumberFormat.getNumberInstance(); + numberInstance.setMaximumFractionDigits(2); + String smeltCount = numberInstance.format(burnTime / ((float) VeryAbstractFurnaceTileEntity.BURN_TIME_STANDARD)); + return new TranslatableComponent("gui.jei.category.fuel.smeltCount", smeltCount); + } + } +} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/api/jei/IconDrawable.java b/src/main/java/mod/alexndr/netherrocks/api/jei/IconDrawable.java new file mode 100644 index 00000000..2490192c --- /dev/null +++ b/src/main/java/mod/alexndr/netherrocks/api/jei/IconDrawable.java @@ -0,0 +1,112 @@ +package mod.alexndr.netherrocks.api.jei; + +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.Tesselator; +import com.mojang.blaze3d.vertex.VertexFormat; +import com.mojang.math.Matrix4f; + +import mezz.jei.api.gui.drawable.IDrawableAnimated; +import mezz.jei.api.gui.drawable.IDrawableStatic; +import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.resources.ResourceLocation; + +public class IconDrawable implements IDrawableStatic, IDrawableAnimated +{ + private final ResourceLocation location; + private final int width; + private final int height; + private int trimLeft; + private int trimRight; + private int trimTop; + private int trimBottom; + + public IconDrawable(ResourceLocation loc, int width, int height) + { + this.location = loc; + this.width = width; + this.height = height; + } + + public IconDrawable trim(int left, int right, int top, int bottom) { + this.trimLeft = left; + this.trimRight = right; + this.trimTop = top; + this.trimBottom = bottom; + return this; + } + + @Override + public int getWidth() + { + return width; + } + + @Override + public int getHeight() + { + return height; + } + + @Override + public void draw(PoseStack stack, int xOffset, int yOffset) + { + draw(stack, xOffset, yOffset, 0, 0, 0, 0); + } + + @Override + public void draw(PoseStack stack, int xOffset, int yOffset, int maskTop, int maskBottom, int maskLeft, + int maskRight) + { + int textureWidth = this.width; + int textureHeight = this.height; + + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderTexture(0, location); + maskTop += trimTop; + maskBottom += trimBottom; + maskLeft += trimLeft; + maskRight += trimRight; + + int x = xOffset + maskLeft; + int y = yOffset + maskTop; + int iwidth = textureWidth - maskRight - maskLeft; + int jheight = textureHeight - maskBottom - maskTop; + +// float uSize = sprite.getU1() - sprite.getU0(); +// float vSize = sprite.getV1() - sprite.getV0(); +// float minU = sprite.getU0() + uSize * (maskLeft / (float) textureWidth); +// float minV = sprite.getV0() + vSize * (maskTop / (float) textureHeight); +// float maxU = sprite.getU1() - uSize * (maskRight / (float) textureWidth); +// float maxV = sprite.getV1() - vSize * (maskBottom / (float) textureHeight); + + float uSize = iwidth; + float vSize = jheight; + float minU = x + uSize * (maskLeft / (float) textureWidth); + float minV = y + vSize * (maskTop / (float) textureHeight); + float maxU = (x + textureWidth) - uSize * (maskRight / (float) textureWidth); + float maxV = (y + textureHeight) - vSize * (maskBottom / (float) textureHeight); + + Tesselator tessellator = Tesselator.getInstance(); + BufferBuilder bufferBuilder = tessellator.getBuilder(); + bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX); + Matrix4f matrix = stack.last().pose(); + bufferBuilder.vertex(matrix, x, y + height, 0) + .uv(minU, maxV) + .endVertex(); + bufferBuilder.vertex(matrix, x + width, y + height, 0) + .uv(maxU, maxV) + .endVertex(); + bufferBuilder.vertex(matrix, x + width, y, 0) + .uv(maxU, minV) + .endVertex(); + bufferBuilder.vertex(matrix, x, y, 0) + .uv(minU, minV) + .endVertex(); + tessellator.end(); + + } // end draw() + +} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/api/jei/VeryAbstractFurnaceVariantCategory.java b/src/main/java/mod/alexndr/netherrocks/api/jei/VeryAbstractFurnaceVariantCategory.java new file mode 100644 index 00000000..d7d3ded3 --- /dev/null +++ b/src/main/java/mod/alexndr/netherrocks/api/jei/VeryAbstractFurnaceVariantCategory.java @@ -0,0 +1,34 @@ +package mod.alexndr.netherrocks.api.jei; + +import mezz.jei.api.gui.drawable.IDrawableAnimated; +import mezz.jei.api.gui.drawable.IDrawableStatic; +import mezz.jei.api.helpers.IGuiHelper; +import mezz.jei.api.recipe.category.IRecipeCategory; +import mod.alexndr.netherrocks.Netherrocks; +import net.minecraft.resources.ResourceLocation; + +/** + * Class copied and adapted from mezz's FurnaceVariantCategory class, just to avoid requiring access to the non-api + * parts of JEI at runtime. JEI is under the MIT license, so it is open source. + * + * @author Sinhika + * + * @param + */ +public abstract class VeryAbstractFurnaceVariantCategory implements IRecipeCategory +{ + public static final ResourceLocation RECIPE_GUI_VANILLA = new ResourceLocation(Netherrocks.MODID, "textures/gui/gui_vanilla.png"); + + protected static final int inputSlot = 0; + protected static final int fuelSlot = 1; + protected static final int outputSlot = 2; + + protected final IDrawableStatic staticFlame; + protected final IDrawableAnimated animatedFlame; + + public VeryAbstractFurnaceVariantCategory(IGuiHelper guiHelper) { + staticFlame = guiHelper.createDrawable(RECIPE_GUI_VANILLA, 82, 114, 14, 14); + animatedFlame = guiHelper.createAnimatedDrawable(staticFlame, 300, IDrawableAnimated.StartDirection.TOP, true); + } + +} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/client/jei/JEIMachinePlugin.java b/src/main/java/mod/alexndr/netherrocks/client/jei/JEIMachinePlugin.java index d67fe5fa..84d6347b 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/jei/JEIMachinePlugin.java +++ b/src/main/java/mod/alexndr/netherrocks/client/jei/JEIMachinePlugin.java @@ -3,9 +3,14 @@ import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.VanillaRecipeCategoryUid; +import mezz.jei.api.helpers.IGuiHelper; +import mezz.jei.api.helpers.IJeiHelpers; import mezz.jei.api.registration.IGuiHandlerRegistration; import mezz.jei.api.registration.IRecipeCatalystRegistration; +import mezz.jei.api.registration.IRecipeCategoryRegistration; +import mezz.jei.api.registration.IRecipeRegistration; import mezz.jei.api.registration.IRecipeTransferRegistration; +import mezz.jei.api.runtime.IIngredientManager; import mod.alexndr.netherrocks.Netherrocks; import mod.alexndr.netherrocks.client.gui.NetherBlastFurnaceScreen; import mod.alexndr.netherrocks.client.gui.NetherFurnaceScreen; @@ -38,23 +43,47 @@ public void registerRecipeCatalysts(IRecipeCatalystRegistration registry) VanillaRecipeCategoryUid.SMOKING); } + @Override + public void registerCategories(IRecipeCategoryRegistration registration) + { + IJeiHelpers jeiHelpers = registration.getJeiHelpers(); + IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); + + registration.addRecipeCategories(new NetherFuelCategory(guiHelper)); + } + + + @Override + public void registerRecipes(IRecipeRegistration registration) + { + IJeiHelpers jeiHelpers = registration.getJeiHelpers(); + IIngredientManager ingredientManager = registration.getIngredientManager(); + registration.addRecipes(NetherFuelRecipeMaker.getFuelRecipes(ingredientManager, jeiHelpers), + NetherFuelCategory.UID); + } + + + @Override public void registerRecipeTransferHandlers(IRecipeTransferRegistration registration) { registration.addRecipeTransferHandler(NetherFurnaceContainer.class, VanillaRecipeCategoryUid.FURNACE, 0, 1, 3, 36); - //registration.addRecipeTransferHandler(NetherFurnaceContainer.class, VanillaRecipeCategoryUid.FUEL, 1, 1, 3, 36); + registration.addRecipeTransferHandler(NetherFurnaceContainer.class, NetherFuelCategory.UID, 1, 1, 3, 36); registration.addRecipeTransferHandler(NetherSmokerContainer.class, VanillaRecipeCategoryUid.SMOKING, 0, 1, 3, 36); - //registration.addRecipeTransferHandler(NetherSmokerContainer.class, VanillaRecipeCategoryUid.FUEL, 1, 1, 3, 36); + registration.addRecipeTransferHandler(NetherSmokerContainer.class, NetherFuelCategory.UID, 1, 1, 3, 36); registration.addRecipeTransferHandler(NetherBlastFurnaceContainer.class, VanillaRecipeCategoryUid.BLASTING, 0, 1, 3, 36); - //registration.addRecipeTransferHandler(NetherBlastFurnaceContainer.class, VanillaRecipeCategoryUid.FUEL, 1, 1, 3, 36); + registration.addRecipeTransferHandler(NetherBlastFurnaceContainer.class, NetherFuelCategory.UID, 1, 1, 3, 36); } @Override public void registerGuiHandlers(IGuiHandlerRegistration registration) { - registration.addRecipeClickArea(NetherFurnaceScreen.class, 78, 32, 28, 23, VanillaRecipeCategoryUid.FURNACE); - registration.addRecipeClickArea(NetherSmokerScreen.class, 78, 32, 28, 23, VanillaRecipeCategoryUid.SMOKING); - registration.addRecipeClickArea(NetherBlastFurnaceScreen.class, 78, 32, 28, 23, VanillaRecipeCategoryUid.BLASTING); + registration.addRecipeClickArea(NetherFurnaceScreen.class, 78, 32, 28, 23, VanillaRecipeCategoryUid.FURNACE, + NetherFuelCategory.UID); + registration.addRecipeClickArea(NetherSmokerScreen.class, 78, 32, 28, 23, VanillaRecipeCategoryUid.SMOKING, + NetherFuelCategory.UID); + registration.addRecipeClickArea(NetherBlastFurnaceScreen.class, 78, 32, 28, 23, + VanillaRecipeCategoryUid.BLASTING, NetherFuelCategory.UID); } @Override diff --git a/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java b/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java new file mode 100644 index 00000000..005fcf6d --- /dev/null +++ b/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java @@ -0,0 +1,113 @@ +package mod.alexndr.netherrocks.client.jei; + +import com.mojang.blaze3d.vertex.PoseStack; + +import mezz.jei.api.constants.VanillaTypes; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.drawable.IDrawable; +import mezz.jei.api.gui.drawable.IDrawableAnimated; +import mezz.jei.api.gui.drawable.IDrawableStatic; +import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; +import mezz.jei.api.helpers.IGuiHelper; +import mezz.jei.api.ingredients.IIngredients; +import mod.alexndr.netherrocks.Netherrocks; +import mod.alexndr.netherrocks.api.jei.AlternateFuelRecipe; +import mod.alexndr.netherrocks.api.jei.IconDrawable; +import mod.alexndr.netherrocks.api.jei.VeryAbstractFurnaceVariantCategory; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Font; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.resources.ResourceLocation; + +public class NetherFuelCategory extends VeryAbstractFurnaceVariantCategory +{ + public static final ResourceLocation UID = new ResourceLocation(Netherrocks.MODID, "nether_furnace_fuel"); + + private final IDrawableStatic background; + private final IDrawableStatic flameTransparentBackground; + private final ResourceLocation flameSpriteResource = new ResourceLocation(Netherrocks.MODID, "textures/gui/flame"); + + private final Component localizedName; + + + public NetherFuelCategory(IGuiHelper guiHelper) + { + super(guiHelper); + + // width of the recipe depends on the text, which is different in each language + Minecraft minecraft = Minecraft.getInstance(); + Font fontRenderer = minecraft.font; + Component smeltCountText = AlternateFuelRecipe.createSmeltCountText(100000); + int stringWidth = fontRenderer.width(smeltCountText.getString()); + + background = guiHelper.drawableBuilder(VeryAbstractFurnaceVariantCategory.RECIPE_GUI_VANILLA, 0, 134, 18, 34) + .addPadding(0, 0, 0, stringWidth + 20) + .build(); + + flameTransparentBackground = new IconDrawable(flameSpriteResource, 14, 14); + localizedName = new TranslatableComponent("gui.jei.category.fuel"); + } // end ctor + + + @Override + public ResourceLocation getUid() + { + return UID; + } + + + @Override + public Class getRecipeClass() + { + return AlternateFuelRecipe.class; + } + + + @Override + public Component getTitle() + { + return localizedName; + } + + + @Override + public IDrawable getBackground() + { + return background; + } + + + @Override + public IDrawable getIcon() + { + return flameTransparentBackground; + } + + + @Override + public void setIngredients(AlternateFuelRecipe recipe, IIngredients ingredients) + { + ingredients.setInputs(VanillaTypes.ITEM, recipe.getInputs()); + } + + + @Override + public void setRecipe(IRecipeLayout recipeLayout, AlternateFuelRecipe recipe, IIngredients ingredients) + { + IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); + + guiItemStacks.init(fuelSlot, true, 0, 16); + guiItemStacks.set(ingredients); + } + + @Override + public void draw(AlternateFuelRecipe recipe, PoseStack poseStack, double mouseX, double mouseY) { + IDrawableAnimated flame = recipe.getFlame(); + flame.draw(poseStack, 1, 0); + Minecraft minecraft = Minecraft.getInstance(); + Component smeltCountText = recipe.getSmeltCountText(); + minecraft.font.draw(poseStack, smeltCountText, 24, 13, 0xFF808080); + } + +} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelRecipeMaker.java b/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelRecipeMaker.java new file mode 100644 index 00000000..a6b063a3 --- /dev/null +++ b/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelRecipeMaker.java @@ -0,0 +1,52 @@ +package mod.alexndr.netherrocks.client.jei; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import mezz.jei.api.constants.VanillaTypes; +import mezz.jei.api.helpers.IGuiHelper; +import mezz.jei.api.helpers.IJeiHelpers; +import mezz.jei.api.runtime.IIngredientManager; +import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceTileEntity; +import mod.alexndr.netherrocks.api.jei.AlternateFuelRecipe; +import net.minecraft.world.item.ItemStack; + +public final class NetherFuelRecipeMaker +{ + private static final Logger LOGGER = LogManager.getLogger(); + + private NetherFuelRecipeMaker() {} + + public static List getFuelRecipes(IIngredientManager ingredientManager, IJeiHelpers helpers) + { + IGuiHelper guiHelper = helpers.getGuiHelper(); + Collection allItemStacks = ingredientManager.getAllIngredients(VanillaTypes.ITEM); + List fuelRecipes = new ArrayList<>(); + for (ItemStack stack : allItemStacks) { + int burnTime = getBurnTime(stack); + if (burnTime > 0) { + fuelRecipes.add(new AlternateFuelRecipe(guiHelper, Collections.singleton(stack), burnTime)); + } + } + return fuelRecipes; + } // end getFuelRecipes() + + private static int getBurnTime(ItemStack itemStack) + { + try { + return AbstractNetherFurnaceTileEntity.getBurnTime(itemStack, null); + } + catch (RuntimeException | LinkageError e) + { + String itemStackInfo = itemStack.toString(); + LOGGER.error("Failed to check if item is fuel {}.", itemStackInfo, e); + return 0; + } + } // end getBurnTime + +} // end class diff --git a/src/main/resources/assets/netherrocks/lang/en_us.json b/src/main/resources/assets/netherrocks/lang/en_us.json index 665e5253..82a0d81c 100644 --- a/src/main/resources/assets/netherrocks/lang/en_us.json +++ b/src/main/resources/assets/netherrocks/lang/en_us.json @@ -101,7 +101,10 @@ "container.nether_furnace": "Nether Furnace", "gui.netherrocks.smeltTimeProgress": "Smelt time %s/%s", "gui.netherrocks.fuelBurnTimeProgress": "Fuel burn time %s/%s", - + "gui.jei.category.fuel.smeltCount.single": "Smelts 1 item", + "gui.jei.category.fuel.smeltCount": "Smelts %s items", + "gui.jei.category.fuel": "Nether Fuel", + "advancements.root.welcome": "Ready to mine Hell!", "advancements.root.welcome.desc": "You've reached the Nether. Look for netherrocks ores.", "advancements.fyrite_ore_ach": "Warm to the Touch", diff --git a/src/main/resources/assets/netherrocks/textures/gui/flame.png b/src/main/resources/assets/netherrocks/textures/gui/flame.png new file mode 100644 index 0000000000000000000000000000000000000000..9ce84c63f7eedecc9edb1399c96672716365dab0 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~LIFM@uKz(m{{J?H?(S|N>xPf3 zj8Lf&P?oVI$S;_|;n|HeAScGt#WAEJj<@R~=Me=F7IpoNjW(a(3vx$nV7kb($NSg% zr*h2Pr+GL#4vKZpUm(!&B!=;sgnEv0j`;oA!Sh{fgTm+N>@Km`d?TPVuHVRBCi%5b iVE*h?t$QzS*>0~>$X&H3c*Pf>Jq(_%elF{r5}E+=DMm>E literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/gui/gui_vanilla.png b/src/main/resources/assets/netherrocks/textures/gui/gui_vanilla.png new file mode 100644 index 0000000000000000000000000000000000000000..c2541136b22e32e5b6081b13ae8b1f90e873d7e1 GIT binary patch literal 9709 zcmZ8{Wl-He(C+WR!4B^3?ykk%io3fz#qHo)+zZ9sTC7mqwODcYB1MZ+;P(H{y&vAY zGf8$cn`Ab-lS%eTteT1(Duf6E0063jytD=Yfc~){01@_I<5;Vw1puV&{#tq;G|YV{ z+&o-u?47JBKKQv=Q&{`j+W>&?YTYM$Z<2P8$Tv$|6PQDDL4xTkw9dc~e0>>pRt=rg z_7#g1Z9xi5Odmw3&D(Sc`5)82x*lV6TGjdNltY z5ARq?zy3nE@%WQ9;-`A8f1CFrY@C!s_@g1=X|yDO5Y1}UvaQ0p8}f!Fmi4^wP~Ezw zFq)O`eaUO=`MHv0uh_7@WA82~--T=N=o@>dzZg>dW=+w^&h)=WPnBl~?1 zDrbCONW##@b8A4)F_Vu;qEy$OMWSZ+3s=wc4xMzs)%~*7>*!@t+vgcn1E;-;pD5FHMmn^lF}^Kjz+3=APy{b!uYo>4%}yF|l4) z(Ak=DO12ou_ujN#+VB?JUqzz-{Nb9h;7r7dn zS#DuzrP-LA(zi+sLB{MG}(o-1UP516(<}-a=He*DzD+OCZPu_9f6a8RuK}CZNm29yj3(>c3 zF%s};*q4RF_7SG|MKYC@K^VYZsOFyXi)qhFOxal!jgAW2nTpRwKYB(FeS-8|VV;NL zq)dXgoP~>kZ^VhO=8Cw%wa^V*$xDf5Y@S+W?5r{il@6iCO3HwFMOv+Jv$`%C^xaA1w-hB z6kTc-7QOWGnL&kLnO^X->PYgHx8r&dkE;{eJg4sLYJTtgg$mhngF z*(9#LYxjF&=Vd<-uA1PZz~pjSEUe=<4*DcnJtm9tCE;gzX73RABcppl&x~}H7#g)h z{5cN#EF!P@?+O#%y}1~VB(^`o!puu z;r8LY_^GjOChl2(D;TRv86rjIk|Jz%U6?SVi8z&EOvfqd<3g{u+uOxU0IX!Ktm_lY z9JINJ*=b%{-RD&zQGi>~N>Zw6L_NFO94>4%F>D)}EXD%V9cz55{ogC%!_5#8j=1NV zKz!DuBZO@EE8`~RN$WMDXpTq78x9Lx|DLz7sMQXYw9EQ5 z^R?Q8L{t~r@r=tcis7(4;HVVgBkzi>PII9%Iq&*zzSt5DqiXb6X;3Xdih-)h>}tny zzL>M4@rrJ_57cTtlm`S$#ZRFXDDBnd1Dqw#UojPfVeIXpH(HF8rU8qQ`~OZLBx=>7 zjctuyq!l~Z(Q^=^87)Sd4GdDj3)$e|zJ>zUge5nRo0pZZX!2vC<9pwkOdj3(8rb#c z--cX8He0eh@dz-&#Xjxl#)_lwqJ_Slb*H*T=YT(aQ~Qh+kAf?`j$L@LlnIlO96&Sy zJf+*;PfX9pUJ-!@G`nayi~MsduS>ee6~6)tG~(o#fjg;bwVCzKBW8(sGT#}7HVwPg z;7BUahP7zof=wsa6$8XcX+KM>dy-j}A`U-^q=+nh+L+oM*_?~u8TBh1T{7V($C@>; zgi*6iWdxN7#tOSDCc>#(5GotxT#?(baD!&7Kz@{+;CIjRm%WV?Wz`6(Anc5{ z<@4w#$?s*(b4Tvpb4ZzE#g9e*-imf? ze&2_@av0}nb3RdZ-`{gHL5Xg&OwaJaJ-UeHbWoJd2q&<3YyXkROT{; z7F#z4fHjm7P${kjAmucacNzp*ltxFSCxusbX*_4?u#|sjzexnE=TjFRd8-OD$ne|1 zjw#qxI;ZL?-(%>m@W_m*33I?qi5ncW$04MZMj;BM$AD7@rBs5kIS8L72 zU%8)^Z8{(xXlAWxI>=S2M#~9UQn*0kGGc+DI##HVsyN>?;%Qzhx;hNGiUkqOf@%@V z!=mfVs86+HuZ7j4IO#QoJZ5TxnhR?TR1g)zMJrZ{H@zFfe7@{>VBzLV&C7)Dw=q87 zA0^*~zSbH(M9pGs^fs99e0u5bMwg5ZFh^{L|NVt?F?O-W-(n&H2(O+3d{+t=duKN*(N&lCO2IZ(>Rt~er1+Q1FN;>6RK0} zDXJBKg@2ifgAf-x(2IrjMuUEj z6+lbC5e0B!$RDl1KCm8~5r~GP+G)V6^UsHh#lg<*fcuQ#@D#+EHa{GSXoWDY=_zZK z_w^i09x7MFQ;RU!^p@s0$jgtW{B%&!lpDhXVe!helR{8s%~w&rNH*GHaHjk%eRnCc z*z5&qmf+|WR&l_W5*gK@Xe+MQc0qO)lFiU|U&DaIGJ8t=tWxHl_+d|h86aOTTj+xt z&=#)SD7orOgKUbeqjM#36T=)h0OTY!N>vXyi4G2UfZZRy4W36RkY8vl5Ce%<9pOC! z=GCGEW(0j{96XPvA0NZjdT;phW1@RxX)4Eos5deSu^mV~>V(PDTK3Rgf7!4_#jh@|v@9}$r*mbBIQ8!p5 zb`sG;=HuA$k!mWMYLu^p4*sRhj$)J;0~psn6wfW$%9+-Mv|>lW`-64l1LCX3d!8TY zRBQ@P&opDfnFj{N``Zs_M0kVgp=$E>YPhnuz8djeI_IJUX6JbP~|6m znD8}xf?!^XXc>5b&6*U+24`4B!V_cBhC&e=v*)lF-^*ypgZ2cz_(P;HMGd7+%yXmK zzA2->cJ%t`lg`GS-_6sswiWeUWk|R5dcX}1mFN#T^_D?J-Aq4RT5)-D_#j^}B&OsK zJ_rPc$)i0&-LJ{Y5N0h<6(JOH?5I27kv_ISi*YY3JhQ_#d4^xh%^fBGgn^6j+{qW zDuZzB+U-p@AA=rD`6#g&tajhe?Z(iNNCgxcp(>hSF>Ao>*uSWBUFxvljOse2fW!aw zFO8+_1V347_Ub19N zyqT-+n(OI)-r(NH>f1JXhoeftek=HF$VZtn;|98@RYgQ2o{}wXrfHr>e=T?qSjf?6 z2u6rv>965Y7dOH1h(na1k zjQL~2-cINFcEmt}+1eMCPuQqS-SZfPUhWuJA5gE1*@u^Xr%IDTnNl@W<=DLS(Sj|_ z2ybE;hwTIqZejl3LGS27ybH9dwNI0AWa`oakm7ZA28gA+63(6HXJB6?ScADqe@WHX zQtRoeS5`?Vs+M`x_~4mo^R7VU<_BbpcAk>!vlnMD)!N2+QI{jPXz;TQDn3_c^m{_E z>>A~>Bd5oFQu%GA)Za}9F$A8Hchhj|^60KH?Y>>(cEPwwrGGnr#TOhv3n&GOrD zG$q(!OZRZ8*w!mN6W%GvTmaUwb!ZR1;xq~j0)~QGE6W2Om~$pKniYv0BC`@oe|E^2 zde*y)kjWS`QJTIbkY3G@Rjv(?lAbUThP1(wDB3@^3{eW;^0vSi9tpJ~=I-~*F9sk z<3=u5Ge1w-6Thv0Aso$qgKZi7c`aM$JikW8k&S%wAknioV-)#}O|yuZB;^^!|8vD^ zrn)HYamvy`ll_48QrS9w2)IrU!>$>#mV9NGm%AG}zi^Kpla zX?MLfMuqH=JY6IgUW#8lCom>rW*KU}-1gmL#Hl-l2c=;2=r!FMU7xBDCdc3mL66;e z?w!G?j9> z%1xZ`c2~ouLYjKItJA3T8N3?nIHc-g=L(&!I>wq7ioB5&Gs`b1QvNJHn-bkAQ-+$Z z#yW(LffE}=Aue~7tmRXLEdA|27vrw*6tv`US8=XYId-}Vmtp(OD@%Aw$gq8)87Rf7 zw%SlvEhsFSJy!hZYMtn!m{}V(QOc2$x8P(-y@-F6zWROQ7OsS93}+O(rb;kGW7Jq@ zoA=tQ8w0M^qpox^MmX83E$Y^zqAd91f#i}{B_n?*_&F0|5Lp|PD_D6$xx5g>GuMw8 zw@yrx@HG5B{=`0ze6?`*0T<6B4z}U;A~T=#$@w(Fi3IYdj?i!Z%vnSD#L<}tA1hWy znqyuEZlGFF$J4XW_@x)Jh7f+03GymgVVX{vpR;SsuXKuoLzVTQPOVJqQXeIrjpQN= zUUH$BuKprb6tw<9T1Ct{-H9SvGJ_6($M5w#R%J;wX_h8ODtUQZLP%uah(6A}24K zDXH&7Xtbgej=(JoWMyKq>Cm&5BkgM;_n zDml+un&>1kij4i|l6KZJh#hr}yht1)VstlNVpD_J^0dw8G*0qf!w6hfMkB&OcC+-d zw-nEV--@nwgc~#To;Kb0)C;?E7-7X&*W`b6sG$ha*9}^r_1g5=KTtD~O)%u&KfpIO z2Y@~tB_WAuj|Z7&SQVw@&M(4!j$-4FQNhCG!!X`Li9wT0$R8-l{IVT}^m%u~1|JP=>@=7=;X(xk(ixhiC5w1eYw-AF(cA2 z8PUn9k54kFk=TU>lOV>G9?G|`ga$YrF%CH3M*e$we9`HoC(1V{X^hgrGO81wD-4d{ zYf0!X-Ch_3X?5tlF-noiGv{hds`NwFVjJ0=QKaV5(!LH*#UN;rB|~D=IdR>O+$@Op zIvwa>Ksd?2SA~^nV!R1xO2#+WsbI+~D|&AE8$OFQ8Ovs#vy?d8s@cHa6ac~bXjV=o z5_8&&H+FpK&5MW%4(sqM@Ot<-YYzTx!&Yg*G!Pg3&MY9up<;bL)ukn=KZtu*Dkg%9 z7RkOOZ&O3u8=a)GH9(za^{(Otw#QcBvb%akj@6(0Yq>#L$+cU1LPO0Km>7@&=%QK`Ba>Ffc^x%H@#Y+1g zBPo!u|1F2}-D-=Z{d!~&H0}gQN`6nn+dJDZwf(VULDO+ySEDcyXN1z;mZWHSY!AH) zE~Xh%J_`9ep{!`c$|8Ik%{h`DDcCk@rCF`~m7;AW0!QAHOx_^0p*+J(L(HDHd^kZ+ z)?=VYHTSN^B!#OWvlM!6JYsyR&YdeyW*C0E;*ewTNp)Y5qeAq)#=c4-cCD&BZ+6ZG z>8+}TaLow8v$@_k&)?=KGx0;;lYz5cDnYyf!PoJ{#n0ONrS*PaPhcleUfPd;;A#mf z$!W_$wk*zZN+)aYh*;-a580qy8udzWopTeUB-!bWC_j=l=^f9~p+f7@VczoZnQc{Z zaT#-5oj$h0KEoMZi35hWN*y=^Yy#~;5Em5N8a~U2j+>D4RH^p6Ufi}n3~9L=vha9#PIuOUVvY(#jTJxhI!76j3N^ zC3yfY3J~T8NBr6jbb|CD^{S{UO(^Ejw601-S)9gyFI_~WX0CEb%*7Q5+&fG6~K4pl3A5xA7|iYIjXN+gVydior|ImTED0LtJDVJH8E#H zuoWi~oV30Re^o#x2sv8>1^yv6s&CumjMmW}6O!JXa(E55z~sqR*d7(A-%iQ>&NXqt|^IXJ%Vpm>#n zYXF)oiGegusUwR@YNDQYx^9>TK8Pj!F9RdOX|g!wl1NIOYSB^k5D3 zOp8@*_j|F~OSUlsZNFJZX53vBLk{6080=34K7D9#-;2R*gF*G)O3>Zd7F5`Nz0FdC ztGMU&D7%hN2b~KVOleoObH5=P2NB-|GFj}cZJV#=@K|pcnqv0OH=5P5y{j`>n#~A% zMIL3z{CT5AaP5g#Y3pqxS;q#$->F`>a!D9iNG$Z@oH0A9kBbUYrvsoXwB{IM6MxOPUD!w)XkbgADRP}U!$Xf z8s}ghAk37sN??=w@T?vdO$n>ywabwx;Y{MRI0V<@OY%LR_Z}O=L&Md)^QuuxbKz@n z88GGt*OWgN<`5-mdU#+47P3P+O&J|#bF4TRwH3UG!R=5AM5`w93Zd9;CtRD;II_hbf#dokY$GPF_q?MmCQgJVQ*+{e4w0yTB@9$q z^cLe_b?}w&uWV*(b=H20gwD=wT|97XHDF~_<`>KtXFZL(^nQsuYa0A5xug?IlD;n> z0lRAXgYzUiyo*)5T( z$3r=mE!pjqawsX}PxEG%1Z`_WLW>vfRuK_0ItEH=raU04uiy@k%`4uuK2$_gUd9P6o=(s0+XJ2=O8 zTunI1??MUhO0wFS9BNtDU!^}DO^cRiwU%-TI3j!cLi>)II=vY_juh_>QtB9D`gF1i zsD1jienb&wH$Jhj&Rdb%A|rj{CK4~!kUy&2!4tKrnHRP5O+6$D!He4Q`!j4Vwd7o1blc!@CHsrPwzV+R`FyukJClu>B6^tKYdgL|eZ!)Z?qq4K_V~xLYeNL#g-F?hw5;^+=?|!hEN~$r2RhV=)rDptKK0( z#|rM6KmCZ)gka)0sg=gDOskvR9)aAznQH|$2PgTDqf&Vb-B;`(bkuwJnf_rj7{Nb& zGFlVdvZvhYin|@O`4{+RPfdDmkU!CaDp2Y&7SE6CRnmDxAHMZVLireMAqc;J-|7lH zhuZk44vr`P=-X2l*Z8gc5`2M79}{B5^n?8C*6e3q{Na*pO&R4{5UN0fA#H&r$HEpV z(^Lt1%h;Z92SxLlG}FNfBaHb8d(=ExCc(=*iOR*{m&YTtjt5O2U*V0N*hi%>q=-X1 zXQl6j#5xc+(L31O6NEJU2599s>AWGzx)k9$CX9IG(DBNH~HWY+~Rq~e^BTkUIvCg zD0+-?Qk4xcnWb7JT9#9;97%4$u~_Jq_Et!5@0jYD>m+7vC91#-lsxu$_Nw&<4p%IB zj9!2C)IJ<8{C)U|tPN+e9Rgx}q~+P>N)P;p=tkH}NvSDFNl~b2sLCoR%lw0G^MX=D zAL4*0ib8x# zF78`F1;t*^z>R^Cr4EMaYtj2(M^lH&@DI|v`sKuUSMXOi)hQNK3eTMAZ_vH0(X!+kuxuinR-vT#-|djg4nuA+ z!5z9t3-OV7=MWUwKI205rn3vnHJ3c#)plFa@sZif>@e-dKq;OCB(l~!uG^dzr97mxd{xDFsh_sWMhE{SYztZc6J*yg^x z04BE{1p(nQ(0|yvikh<4KPLcEKu90}hZf_n^rN@wDFVc@L~Xip=_;Qluh_-cspNe5xMo-XA%AmpD6`kN;)TmXO@ zP>`0;@?Aa4kFQ_lK#7{gVYYA2L$+PLdu9J#zBI#=TrN|6wnbDX&i~_Io~a&N#Rcp1 z4(n&Um>8)M%*z;<{ZLYM;Y`);?%NAOARvHk0Q+O`L)yu|RI2 zui?m-ux9)K;tjb`uaFG@j~fpp*qAxJ^|1%znXU5yXUJ=Q&=wV4lx!G~CjOTI;OOQ; zY&!!^@^&0RnKm-+b$TC;jnt}dMviQD0`s!%3=4H>_r9lq{H-GBdZcF(xG@+0{P*yC@2_7z%msCUZ=&vC4sRZC zKB{9lg|2=UJRFRCYZwbmOv53%+1I-aForQJI`Gld1u%OW#s&1oBaf9zfyyo`*zEdD z*us!zxNSz_Rv_#f!*_!OY z0vCXSXKV}dZ8H#nQfwh1a4=?i++m2jwYUN59?6ix=kinKe`?oJ{SC(A`)Utf-DyIk zbWLh#hLHQ9y-}mm%t0*RW*&?^1_IJSF^wf$fV;OA0tFkMBPe+^k;x@tzq85N{;E$d zOz`4g6#xGuUR|1uH3tKgv&`@Z+>hyhkt*O_w#Frk;#1rL@*;o+I&>cPKNc4%^YV|= z11x|>U>HPzWWfeqpiYoWIs0tcOcG5;WR)g2HQ1ma}F zTHc8Q{)J!sNP2h5eR0611iiT_+p$>@R~L)`JzlRAl56w|g&6X3I~f3UmNv`Dqd_;~ zi-AH|AdT1j0=Bml73+U(^M8Vw{+$Wt@HEV#PQ-Xt4yos-#|1XEbMBG9W2^Td3PQkS z3yW*$USsfoT>3xW6@VReLgN}T<`n`kSO88yAJ_vDz?}HKPM4K{j&8)blKh8Jov@dC zOi6Vd01$@-=z18QWPu}WFaXSe|8I2szd+Fj;+D|j;l-~38f0Mu7K)H?o+3^&RG@+c zx<2&t`J9>t7rNgvAh>oUZ~#a*keP1EA^`J%{BP<~B=KQU$z9Nl0brq%WcyF^eo^mG zR1yLt8vy#xh_S8Ee7OHi Date: Wed, 25 Aug 2021 19:31:52 -0500 Subject: [PATCH 25/56] fully implemented NetherFurnaceFuelCategory for JEI. Had to make my own version of the spriteUploader to avoid stepping outside the JEI API --- .../mod/alexndr/netherrocks/Netherrocks.java | 3 + .../gui/DrawableSprite.java} | 70 ++++++++----------- .../api/client/gui/SimpleSpriteUploader.java | 44 ++++++++++++ .../netherrocks/api/client/gui/Textures.java | 37 ++++++++++ .../client/ClientModEventSubscriber.java | 21 +++++- .../client/jei/NetherFuelCategory.java | 6 +- 6 files changed, 135 insertions(+), 46 deletions(-) rename src/main/java/mod/alexndr/netherrocks/api/{jei/IconDrawable.java => client/gui/DrawableSprite.java} (52%) create mode 100644 src/main/java/mod/alexndr/netherrocks/api/client/gui/SimpleSpriteUploader.java create mode 100644 src/main/java/mod/alexndr/netherrocks/api/client/gui/Textures.java diff --git a/src/main/java/mod/alexndr/netherrocks/Netherrocks.java b/src/main/java/mod/alexndr/netherrocks/Netherrocks.java index f046c1f1..5217f8cf 100644 --- a/src/main/java/mod/alexndr/netherrocks/Netherrocks.java +++ b/src/main/java/mod/alexndr/netherrocks/Netherrocks.java @@ -9,6 +9,7 @@ import mod.alexndr.netherrocks.init.ModFeatures; import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.netherrocks.init.ModTiles; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; @@ -21,6 +22,8 @@ public class Netherrocks { // modid public static final String MODID = "netherrocks"; + + public static final ResourceLocation SIMPLE_TEXTURE_ATLAS = new ResourceLocation(MODID, "textures/atlas/gui.png"); // Directly reference a log4j logger. public static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/mod/alexndr/netherrocks/api/jei/IconDrawable.java b/src/main/java/mod/alexndr/netherrocks/api/client/gui/DrawableSprite.java similarity index 52% rename from src/main/java/mod/alexndr/netherrocks/api/jei/IconDrawable.java rename to src/main/java/mod/alexndr/netherrocks/api/client/gui/DrawableSprite.java index 2490192c..4a26e188 100644 --- a/src/main/java/mod/alexndr/netherrocks/api/jei/IconDrawable.java +++ b/src/main/java/mod/alexndr/netherrocks/api/client/gui/DrawableSprite.java @@ -1,4 +1,4 @@ -package mod.alexndr.netherrocks.api.jei; +package mod.alexndr.netherrocks.api.client.gui; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.BufferBuilder; @@ -8,13 +8,16 @@ import com.mojang.blaze3d.vertex.VertexFormat; import com.mojang.math.Matrix4f; -import mezz.jei.api.gui.drawable.IDrawableAnimated; import mezz.jei.api.gui.drawable.IDrawableStatic; +import mod.alexndr.netherrocks.Netherrocks; import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.resources.ResourceLocation; -public class IconDrawable implements IDrawableStatic, IDrawableAnimated +public class DrawableSprite implements IDrawableStatic { + private final SimpleSpriteUploader spriteUploader; + private final ResourceLocation location; private final int width; private final int height; @@ -22,49 +25,46 @@ public class IconDrawable implements IDrawableStatic, IDrawableAnimated private int trimRight; private int trimTop; private int trimBottom; - - public IconDrawable(ResourceLocation loc, int width, int height) - { - this.location = loc; + + public DrawableSprite(SimpleSpriteUploader spriteUploader, ResourceLocation location, int width, int height) { + this.spriteUploader = spriteUploader; + this.location = location; this.width = width; this.height = height; } - public IconDrawable trim(int left, int right, int top, int bottom) { + public DrawableSprite trim(int left, int right, int top, int bottom) { this.trimLeft = left; this.trimRight = right; this.trimTop = top; this.trimBottom = bottom; return this; } - + @Override - public int getWidth() - { + public int getWidth() { return width; } @Override - public int getHeight() - { + public int getHeight() { return height; } @Override - public void draw(PoseStack stack, int xOffset, int yOffset) - { - draw(stack, xOffset, yOffset, 0, 0, 0, 0); + public void draw(PoseStack poseStack, int xOffset, int yOffset) { + draw(poseStack, xOffset, yOffset, 0, 0, 0, 0); } @Override - public void draw(PoseStack stack, int xOffset, int yOffset, int maskTop, int maskBottom, int maskLeft, - int maskRight) - { + public void draw(PoseStack poseStack, int xOffset, int yOffset, int maskTop, int maskBottom, int maskLeft, int maskRight) { + TextureAtlasSprite sprite = spriteUploader.getSprite(location); int textureWidth = this.width; int textureHeight = this.height; RenderSystem.setShader(GameRenderer::getPositionTexShader); - RenderSystem.setShaderTexture(0, location); + RenderSystem.setShaderTexture(0, Netherrocks.SIMPLE_TEXTURE_ATLAS); + maskTop += trimTop; maskBottom += trimBottom; maskLeft += trimLeft; @@ -72,27 +72,20 @@ public void draw(PoseStack stack, int xOffset, int yOffset, int maskTop, int mas int x = xOffset + maskLeft; int y = yOffset + maskTop; - int iwidth = textureWidth - maskRight - maskLeft; - int jheight = textureHeight - maskBottom - maskTop; - -// float uSize = sprite.getU1() - sprite.getU0(); -// float vSize = sprite.getV1() - sprite.getV0(); -// float minU = sprite.getU0() + uSize * (maskLeft / (float) textureWidth); -// float minV = sprite.getV0() + vSize * (maskTop / (float) textureHeight); -// float maxU = sprite.getU1() - uSize * (maskRight / (float) textureWidth); -// float maxV = sprite.getV1() - vSize * (maskBottom / (float) textureHeight); + int width = textureWidth - maskRight - maskLeft; + int height = textureHeight - maskBottom - maskTop; + float uSize = sprite.getU1() - sprite.getU0(); + float vSize = sprite.getV1() - sprite.getV0(); - float uSize = iwidth; - float vSize = jheight; - float minU = x + uSize * (maskLeft / (float) textureWidth); - float minV = y + vSize * (maskTop / (float) textureHeight); - float maxU = (x + textureWidth) - uSize * (maskRight / (float) textureWidth); - float maxV = (y + textureHeight) - vSize * (maskBottom / (float) textureHeight); + float minU = sprite.getU0() + uSize * (maskLeft / (float) textureWidth); + float minV = sprite.getV0() + vSize * (maskTop / (float) textureHeight); + float maxU = sprite.getU1() - uSize * (maskRight / (float) textureWidth); + float maxV = sprite.getV1() - vSize * (maskBottom / (float) textureHeight); Tesselator tessellator = Tesselator.getInstance(); BufferBuilder bufferBuilder = tessellator.getBuilder(); bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX); - Matrix4f matrix = stack.last().pose(); + Matrix4f matrix = poseStack.last().pose(); bufferBuilder.vertex(matrix, x, y + height, 0) .uv(minU, maxV) .endVertex(); @@ -106,7 +99,4 @@ public void draw(PoseStack stack, int xOffset, int yOffset, int maskTop, int mas .uv(minU, minV) .endVertex(); tessellator.end(); - - } // end draw() - -} // end class + }} diff --git a/src/main/java/mod/alexndr/netherrocks/api/client/gui/SimpleSpriteUploader.java b/src/main/java/mod/alexndr/netherrocks/api/client/gui/SimpleSpriteUploader.java new file mode 100644 index 00000000..3ae399fb --- /dev/null +++ b/src/main/java/mod/alexndr/netherrocks/api/client/gui/SimpleSpriteUploader.java @@ -0,0 +1,44 @@ +package mod.alexndr.netherrocks.api.client.gui; + +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import java.util.stream.Stream; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.resources.TextureAtlasHolder; +import net.minecraft.resources.ResourceLocation; + +/** + * Borrows heavily from mezz's JeiSpriteUploader class. + * @author Sinhika + * + */ +public class SimpleSpriteUploader extends TextureAtlasHolder +{ + private final Set registeredSprites = new HashSet<>(); + + + public SimpleSpriteUploader(TextureManager textureMgr, ResourceLocation atlasLocation) + { + super(textureMgr, atlasLocation, "gui"); + } + + public void registerSprite(ResourceLocation location) { + registeredSprites.add(location); + } + + @Override + protected Stream getResourcesToLoad() { + return Collections.unmodifiableSet(registeredSprites).stream(); + } + + /** + * Overridden to make it public + */ + @Override + public TextureAtlasSprite getSprite(ResourceLocation location) { + return super.getSprite(location); + } +} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/api/client/gui/Textures.java b/src/main/java/mod/alexndr/netherrocks/api/client/gui/Textures.java new file mode 100644 index 00000000..2df62a85 --- /dev/null +++ b/src/main/java/mod/alexndr/netherrocks/api/client/gui/Textures.java @@ -0,0 +1,37 @@ +package mod.alexndr.netherrocks.api.client.gui; + +import mezz.jei.api.gui.drawable.IDrawableStatic; +import mod.alexndr.netherrocks.Netherrocks; +import net.minecraft.resources.ResourceLocation; + +public final class Textures +{ + private final SimpleSpriteUploader spriteUploader; + private final IDrawableStatic flameIcon; + + public Textures(SimpleSpriteUploader spUploader) + { + this.spriteUploader = spUploader; + this.flameIcon = registerGuiSprite("flame", 14, 14); + + } + + private ResourceLocation registerSprite(String name) { + ResourceLocation location = new ResourceLocation(Netherrocks.MODID, name); + spriteUploader.registerSprite(location); + return location; + } + + private DrawableSprite registerGuiSprite(String name, int width, int height) { + ResourceLocation location = registerSprite(name); + return new DrawableSprite(spriteUploader, location, width, height); + } + + public IDrawableStatic getFlameIcon() { + return flameIcon; + } + + public SimpleSpriteUploader getSpriteUploader() { + return spriteUploader; + } +} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java b/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java index 28791b1e..df848110 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java +++ b/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java @@ -4,12 +4,16 @@ import org.apache.logging.log4j.Logger; import mod.alexndr.netherrocks.Netherrocks; +import mod.alexndr.netherrocks.api.client.gui.SimpleSpriteUploader; +import mod.alexndr.netherrocks.api.client.gui.Textures; import mod.alexndr.netherrocks.client.gui.NetherBlastFurnaceScreen; import mod.alexndr.netherrocks.client.gui.NetherFurnaceScreen; import mod.alexndr.netherrocks.client.gui.NetherSmokerScreen; import mod.alexndr.netherrocks.init.ModContainers; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.MenuScreens; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.RegisterClientReloadListenersEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; @@ -23,7 +27,9 @@ public class ClientModEventSubscriber { private static final Logger LOGGER = LogManager.getLogger(Netherrocks.MODID + " Client Mod Event Subscriber"); - + public static Textures textures; + + //public static Textures textures; /** * We need to register our renderers on the client because rendering code does not exist on the server * and trying to use it on a dedicated server will crash the game. @@ -43,6 +49,17 @@ public static void onFMLClientSetupEvent(final FMLClientSetupEvent event) MenuScreens.register(ModContainers.NETHER_SMOKER.get(), NetherSmokerScreen::new); LOGGER.debug("Registered ContainerType Screens"); }); + } // end onFMLClientSetupEvent() + + @SubscribeEvent + public static void onRegisterClientReloadListenersEvent(final RegisterClientReloadListenersEvent event) + { + // add things to texture atlas. + Minecraft minecraft = Minecraft.getInstance(); + SimpleSpriteUploader spriteUploader = new SimpleSpriteUploader(minecraft.textureManager, Netherrocks.SIMPLE_TEXTURE_ATLAS); + textures = new Textures(spriteUploader); + event.registerReloadListener(spriteUploader); + } // end onRegisterClientReloadListenersEvent - } // end () + } // end class diff --git a/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java b/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java index 005fcf6d..26dc9754 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java +++ b/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java @@ -12,8 +12,8 @@ import mezz.jei.api.ingredients.IIngredients; import mod.alexndr.netherrocks.Netherrocks; import mod.alexndr.netherrocks.api.jei.AlternateFuelRecipe; -import mod.alexndr.netherrocks.api.jei.IconDrawable; import mod.alexndr.netherrocks.api.jei.VeryAbstractFurnaceVariantCategory; +import mod.alexndr.netherrocks.client.ClientModEventSubscriber; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.network.chat.Component; @@ -26,8 +26,6 @@ public class NetherFuelCategory extends VeryAbstractFurnaceVariantCategory Date: Wed, 25 Aug 2021 21:06:01 -0500 Subject: [PATCH 26/56] updated for removal/move of api.jei stuff to SimpleCoreLib; made nether fuels show poroperly in JEI --- gradle.properties | 2 +- .../api/client/gui/DrawableSprite.java | 102 ------------------ .../api/client/gui/SimpleSpriteUploader.java | 44 -------- .../netherrocks/api/client/gui/Textures.java | 37 ------- .../api/jei/AlternateFuelRecipe.java | 55 ---------- .../VeryAbstractFurnaceVariantCategory.java | 34 ------ .../client/ClientModEventSubscriber.java | 7 +- .../client/jei/JEIMachinePlugin.java | 6 +- .../client/jei/NetherFuelCategory.java | 4 +- .../client/jei/NetherFuelRecipeMaker.java | 2 +- src/main/resources/META-INF/mods.toml | 2 +- 11 files changed, 12 insertions(+), 283 deletions(-) delete mode 100644 src/main/java/mod/alexndr/netherrocks/api/client/gui/DrawableSprite.java delete mode 100644 src/main/java/mod/alexndr/netherrocks/api/client/gui/SimpleSpriteUploader.java delete mode 100644 src/main/java/mod/alexndr/netherrocks/api/client/gui/Textures.java delete mode 100644 src/main/java/mod/alexndr/netherrocks/api/jei/AlternateFuelRecipe.java delete mode 100644 src/main/java/mod/alexndr/netherrocks/api/jei/VeryAbstractFurnaceVariantCategory.java diff --git a/gradle.properties b/gradle.properties index 5461c6ca..0af8b73f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ version_forge = 1.17.1-37.0.43 # Simple Ores: Netherrocks version_mod = 3.0.0 -simplecorelib_version = 1.17.1-3.0.0.8 +simplecorelib_version = 1.17.1-3.0.1.0 simpleores_version = 1.17.1-3.0.0.1 version_mcjei = 1.17.1 jei_version = 8.0.0.12 diff --git a/src/main/java/mod/alexndr/netherrocks/api/client/gui/DrawableSprite.java b/src/main/java/mod/alexndr/netherrocks/api/client/gui/DrawableSprite.java deleted file mode 100644 index 4a26e188..00000000 --- a/src/main/java/mod/alexndr/netherrocks/api/client/gui/DrawableSprite.java +++ /dev/null @@ -1,102 +0,0 @@ -package mod.alexndr.netherrocks.api.client.gui; - -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.Tesselator; -import com.mojang.blaze3d.vertex.VertexFormat; -import com.mojang.math.Matrix4f; - -import mezz.jei.api.gui.drawable.IDrawableStatic; -import mod.alexndr.netherrocks.Netherrocks; -import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.resources.ResourceLocation; - -public class DrawableSprite implements IDrawableStatic -{ - private final SimpleSpriteUploader spriteUploader; - - private final ResourceLocation location; - private final int width; - private final int height; - private int trimLeft; - private int trimRight; - private int trimTop; - private int trimBottom; - - public DrawableSprite(SimpleSpriteUploader spriteUploader, ResourceLocation location, int width, int height) { - this.spriteUploader = spriteUploader; - this.location = location; - this.width = width; - this.height = height; - } - - public DrawableSprite trim(int left, int right, int top, int bottom) { - this.trimLeft = left; - this.trimRight = right; - this.trimTop = top; - this.trimBottom = bottom; - return this; - } - - @Override - public int getWidth() { - return width; - } - - @Override - public int getHeight() { - return height; - } - - @Override - public void draw(PoseStack poseStack, int xOffset, int yOffset) { - draw(poseStack, xOffset, yOffset, 0, 0, 0, 0); - } - - @Override - public void draw(PoseStack poseStack, int xOffset, int yOffset, int maskTop, int maskBottom, int maskLeft, int maskRight) { - TextureAtlasSprite sprite = spriteUploader.getSprite(location); - int textureWidth = this.width; - int textureHeight = this.height; - - RenderSystem.setShader(GameRenderer::getPositionTexShader); - RenderSystem.setShaderTexture(0, Netherrocks.SIMPLE_TEXTURE_ATLAS); - - maskTop += trimTop; - maskBottom += trimBottom; - maskLeft += trimLeft; - maskRight += trimRight; - - int x = xOffset + maskLeft; - int y = yOffset + maskTop; - int width = textureWidth - maskRight - maskLeft; - int height = textureHeight - maskBottom - maskTop; - float uSize = sprite.getU1() - sprite.getU0(); - float vSize = sprite.getV1() - sprite.getV0(); - - float minU = sprite.getU0() + uSize * (maskLeft / (float) textureWidth); - float minV = sprite.getV0() + vSize * (maskTop / (float) textureHeight); - float maxU = sprite.getU1() - uSize * (maskRight / (float) textureWidth); - float maxV = sprite.getV1() - vSize * (maskBottom / (float) textureHeight); - - Tesselator tessellator = Tesselator.getInstance(); - BufferBuilder bufferBuilder = tessellator.getBuilder(); - bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX); - Matrix4f matrix = poseStack.last().pose(); - bufferBuilder.vertex(matrix, x, y + height, 0) - .uv(minU, maxV) - .endVertex(); - bufferBuilder.vertex(matrix, x + width, y + height, 0) - .uv(maxU, maxV) - .endVertex(); - bufferBuilder.vertex(matrix, x + width, y, 0) - .uv(maxU, minV) - .endVertex(); - bufferBuilder.vertex(matrix, x, y, 0) - .uv(minU, minV) - .endVertex(); - tessellator.end(); - }} diff --git a/src/main/java/mod/alexndr/netherrocks/api/client/gui/SimpleSpriteUploader.java b/src/main/java/mod/alexndr/netherrocks/api/client/gui/SimpleSpriteUploader.java deleted file mode 100644 index 3ae399fb..00000000 --- a/src/main/java/mod/alexndr/netherrocks/api/client/gui/SimpleSpriteUploader.java +++ /dev/null @@ -1,44 +0,0 @@ -package mod.alexndr.netherrocks.api.client.gui; - -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import java.util.stream.Stream; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.resources.TextureAtlasHolder; -import net.minecraft.resources.ResourceLocation; - -/** - * Borrows heavily from mezz's JeiSpriteUploader class. - * @author Sinhika - * - */ -public class SimpleSpriteUploader extends TextureAtlasHolder -{ - private final Set registeredSprites = new HashSet<>(); - - - public SimpleSpriteUploader(TextureManager textureMgr, ResourceLocation atlasLocation) - { - super(textureMgr, atlasLocation, "gui"); - } - - public void registerSprite(ResourceLocation location) { - registeredSprites.add(location); - } - - @Override - protected Stream getResourcesToLoad() { - return Collections.unmodifiableSet(registeredSprites).stream(); - } - - /** - * Overridden to make it public - */ - @Override - public TextureAtlasSprite getSprite(ResourceLocation location) { - return super.getSprite(location); - } -} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/api/client/gui/Textures.java b/src/main/java/mod/alexndr/netherrocks/api/client/gui/Textures.java deleted file mode 100644 index 2df62a85..00000000 --- a/src/main/java/mod/alexndr/netherrocks/api/client/gui/Textures.java +++ /dev/null @@ -1,37 +0,0 @@ -package mod.alexndr.netherrocks.api.client.gui; - -import mezz.jei.api.gui.drawable.IDrawableStatic; -import mod.alexndr.netherrocks.Netherrocks; -import net.minecraft.resources.ResourceLocation; - -public final class Textures -{ - private final SimpleSpriteUploader spriteUploader; - private final IDrawableStatic flameIcon; - - public Textures(SimpleSpriteUploader spUploader) - { - this.spriteUploader = spUploader; - this.flameIcon = registerGuiSprite("flame", 14, 14); - - } - - private ResourceLocation registerSprite(String name) { - ResourceLocation location = new ResourceLocation(Netherrocks.MODID, name); - spriteUploader.registerSprite(location); - return location; - } - - private DrawableSprite registerGuiSprite(String name, int width, int height) { - ResourceLocation location = registerSprite(name); - return new DrawableSprite(spriteUploader, location, width, height); - } - - public IDrawableStatic getFlameIcon() { - return flameIcon; - } - - public SimpleSpriteUploader getSpriteUploader() { - return spriteUploader; - } -} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/api/jei/AlternateFuelRecipe.java b/src/main/java/mod/alexndr/netherrocks/api/jei/AlternateFuelRecipe.java deleted file mode 100644 index 0ba5fe80..00000000 --- a/src/main/java/mod/alexndr/netherrocks/api/jei/AlternateFuelRecipe.java +++ /dev/null @@ -1,55 +0,0 @@ -package mod.alexndr.netherrocks.api.jei; - -import java.text.NumberFormat; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import com.google.common.base.Preconditions; - -import mezz.jei.api.gui.drawable.IDrawableAnimated; -import mezz.jei.api.helpers.IGuiHelper; -import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceTileEntity; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; -import net.minecraft.world.item.ItemStack; - -public class AlternateFuelRecipe -{ - private final List inputs; - private final Component smeltCountText; - private final IDrawableAnimated flame; - - - public AlternateFuelRecipe(IGuiHelper guiHelper, Collection input, int burnTime) - { - Preconditions.checkArgument(burnTime > 0, "burn time must be greater than 0"); - this.inputs = new ArrayList<>(input); - this.smeltCountText = createSmeltCountText(burnTime); - this.flame = guiHelper.drawableBuilder(VeryAbstractFurnaceVariantCategory.RECIPE_GUI_VANILLA, 82, 114, 14, 14) - .buildAnimated(burnTime, IDrawableAnimated.StartDirection.TOP, true); - } - - public List getInputs() { - return inputs; - } - - public Component getSmeltCountText() { - return smeltCountText; - } - - public IDrawableAnimated getFlame() { - return flame; - } - - public static Component createSmeltCountText(int burnTime) { - if (burnTime == VeryAbstractFurnaceTileEntity.BURN_TIME_STANDARD) { - return new TranslatableComponent("gui.jei.category.fuel.smeltCount.single"); - } else { - NumberFormat numberInstance = NumberFormat.getNumberInstance(); - numberInstance.setMaximumFractionDigits(2); - String smeltCount = numberInstance.format(burnTime / ((float) VeryAbstractFurnaceTileEntity.BURN_TIME_STANDARD)); - return new TranslatableComponent("gui.jei.category.fuel.smeltCount", smeltCount); - } - } -} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/api/jei/VeryAbstractFurnaceVariantCategory.java b/src/main/java/mod/alexndr/netherrocks/api/jei/VeryAbstractFurnaceVariantCategory.java deleted file mode 100644 index d7d3ded3..00000000 --- a/src/main/java/mod/alexndr/netherrocks/api/jei/VeryAbstractFurnaceVariantCategory.java +++ /dev/null @@ -1,34 +0,0 @@ -package mod.alexndr.netherrocks.api.jei; - -import mezz.jei.api.gui.drawable.IDrawableAnimated; -import mezz.jei.api.gui.drawable.IDrawableStatic; -import mezz.jei.api.helpers.IGuiHelper; -import mezz.jei.api.recipe.category.IRecipeCategory; -import mod.alexndr.netherrocks.Netherrocks; -import net.minecraft.resources.ResourceLocation; - -/** - * Class copied and adapted from mezz's FurnaceVariantCategory class, just to avoid requiring access to the non-api - * parts of JEI at runtime. JEI is under the MIT license, so it is open source. - * - * @author Sinhika - * - * @param - */ -public abstract class VeryAbstractFurnaceVariantCategory implements IRecipeCategory -{ - public static final ResourceLocation RECIPE_GUI_VANILLA = new ResourceLocation(Netherrocks.MODID, "textures/gui/gui_vanilla.png"); - - protected static final int inputSlot = 0; - protected static final int fuelSlot = 1; - protected static final int outputSlot = 2; - - protected final IDrawableStatic staticFlame; - protected final IDrawableAnimated animatedFlame; - - public VeryAbstractFurnaceVariantCategory(IGuiHelper guiHelper) { - staticFlame = guiHelper.createDrawable(RECIPE_GUI_VANILLA, 82, 114, 14, 14); - animatedFlame = guiHelper.createAnimatedDrawable(staticFlame, 300, IDrawableAnimated.StartDirection.TOP, true); - } - -} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java b/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java index df848110..c953efb4 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java +++ b/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java @@ -4,12 +4,13 @@ import org.apache.logging.log4j.Logger; import mod.alexndr.netherrocks.Netherrocks; -import mod.alexndr.netherrocks.api.client.gui.SimpleSpriteUploader; -import mod.alexndr.netherrocks.api.client.gui.Textures; import mod.alexndr.netherrocks.client.gui.NetherBlastFurnaceScreen; import mod.alexndr.netherrocks.client.gui.NetherFurnaceScreen; import mod.alexndr.netherrocks.client.gui.NetherSmokerScreen; import mod.alexndr.netherrocks.init.ModContainers; +import mod.alexndr.simplecorelib.SimpleCoreLib; +import mod.alexndr.simplecorelib.client.gui.SimpleSpriteUploader; +import mod.alexndr.simplecorelib.client.gui.Textures; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.MenuScreens; import net.minecraftforge.api.distmarker.Dist; @@ -56,7 +57,7 @@ public static void onRegisterClientReloadListenersEvent(final RegisterClientRelo { // add things to texture atlas. Minecraft minecraft = Minecraft.getInstance(); - SimpleSpriteUploader spriteUploader = new SimpleSpriteUploader(minecraft.textureManager, Netherrocks.SIMPLE_TEXTURE_ATLAS); + SimpleSpriteUploader spriteUploader = new SimpleSpriteUploader(minecraft.textureManager, SimpleCoreLib.SIMPLE_TEXTURE_ATLAS); textures = new Textures(spriteUploader); event.registerReloadListener(spriteUploader); } // end onRegisterClientReloadListenersEvent diff --git a/src/main/java/mod/alexndr/netherrocks/client/jei/JEIMachinePlugin.java b/src/main/java/mod/alexndr/netherrocks/client/jei/JEIMachinePlugin.java index 84d6347b..01720db3 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/jei/JEIMachinePlugin.java +++ b/src/main/java/mod/alexndr/netherrocks/client/jei/JEIMachinePlugin.java @@ -36,11 +36,11 @@ public class JEIMachinePlugin implements IModPlugin public void registerRecipeCatalysts(IRecipeCatalystRegistration registry) { registry.addRecipeCatalyst(new ItemStack(ModBlocks.nether_furnace.get()), - VanillaRecipeCategoryUid.FURNACE); + VanillaRecipeCategoryUid.FURNACE, NetherFuelCategory.UID); registry.addRecipeCatalyst(new ItemStack(ModBlocks.nether_blast_furnace.get()), - VanillaRecipeCategoryUid.BLASTING); + VanillaRecipeCategoryUid.BLASTING, NetherFuelCategory.UID); registry.addRecipeCatalyst(new ItemStack(ModBlocks.nether_smoker.get()), - VanillaRecipeCategoryUid.SMOKING); + VanillaRecipeCategoryUid.SMOKING, NetherFuelCategory.UID); } diff --git a/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java b/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java index 26dc9754..903382ad 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java +++ b/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java @@ -11,9 +11,9 @@ import mezz.jei.api.helpers.IGuiHelper; import mezz.jei.api.ingredients.IIngredients; import mod.alexndr.netherrocks.Netherrocks; -import mod.alexndr.netherrocks.api.jei.AlternateFuelRecipe; -import mod.alexndr.netherrocks.api.jei.VeryAbstractFurnaceVariantCategory; import mod.alexndr.netherrocks.client.ClientModEventSubscriber; +import mod.alexndr.simplecorelib.client.jei.AlternateFuelRecipe; +import mod.alexndr.simplecorelib.client.jei.VeryAbstractFurnaceVariantCategory; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.network.chat.Component; diff --git a/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelRecipeMaker.java b/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelRecipeMaker.java index a6b063a3..f2fc0eaa 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelRecipeMaker.java +++ b/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelRecipeMaker.java @@ -13,7 +13,7 @@ import mezz.jei.api.helpers.IJeiHelpers; import mezz.jei.api.runtime.IIngredientManager; import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceTileEntity; -import mod.alexndr.netherrocks.api.jei.AlternateFuelRecipe; +import mod.alexndr.simplecorelib.client.jei.AlternateFuelRecipe; import net.minecraft.world.item.ItemStack; public final class NetherFuelRecipeMaker diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index c81dc86f..2269117e 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -39,7 +39,7 @@ Additional Credits: AzazEL3095 (Spanish translation) [[dependencies.netherrocks]] modId="simplecorelib" mandatory=true - versionRange="[1.17.1-3.0.0.7,1.17.1-3.1.0.0)" + versionRange="[1.17.1-3.0.1.0,1.17.1-3.1.0.0)" ordering="NONE" side="BOTH" From ee91315667c15b2ed6ed7db6baceed738cb09027 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Thu, 26 Aug 2021 16:52:48 -0500 Subject: [PATCH 27/56] moved those textures to SimpleCoreLib --- .../assets/netherrocks/textures/gui/flame.png | Bin 192 -> 0 bytes .../netherrocks/textures/gui/gui_vanilla.png | Bin 9709 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/netherrocks/textures/gui/flame.png delete mode 100644 src/main/resources/assets/netherrocks/textures/gui/gui_vanilla.png diff --git a/src/main/resources/assets/netherrocks/textures/gui/flame.png b/src/main/resources/assets/netherrocks/textures/gui/flame.png deleted file mode 100644 index 9ce84c63f7eedecc9edb1399c96672716365dab0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~LIFM@uKz(m{{J?H?(S|N>xPf3 zj8Lf&P?oVI$S;_|;n|HeAScGt#WAEJj<@R~=Me=F7IpoNjW(a(3vx$nV7kb($NSg% zr*h2Pr+GL#4vKZpUm(!&B!=;sgnEv0j`;oA!Sh{fgTm+N>@Km`d?TPVuHVRBCi%5b iVE*h?t$QzS*>0~>$X&H3c*Pf>Jq(_%elF{r5}E+=DMm>E diff --git a/src/main/resources/assets/netherrocks/textures/gui/gui_vanilla.png b/src/main/resources/assets/netherrocks/textures/gui/gui_vanilla.png deleted file mode 100644 index c2541136b22e32e5b6081b13ae8b1f90e873d7e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9709 zcmZ8{Wl-He(C+WR!4B^3?ykk%io3fz#qHo)+zZ9sTC7mqwODcYB1MZ+;P(H{y&vAY zGf8$cn`Ab-lS%eTteT1(Duf6E0063jytD=Yfc~){01@_I<5;Vw1puV&{#tq;G|YV{ z+&o-u?47JBKKQv=Q&{`j+W>&?YTYM$Z<2P8$Tv$|6PQDDL4xTkw9dc~e0>>pRt=rg z_7#g1Z9xi5Odmw3&D(Sc`5)82x*lV6TGjdNltY z5ARq?zy3nE@%WQ9;-`A8f1CFrY@C!s_@g1=X|yDO5Y1}UvaQ0p8}f!Fmi4^wP~Ezw zFq)O`eaUO=`MHv0uh_7@WA82~--T=N=o@>dzZg>dW=+w^&h)=WPnBl~?1 zDrbCONW##@b8A4)F_Vu;qEy$OMWSZ+3s=wc4xMzs)%~*7>*!@t+vgcn1E;-;pD5FHMmn^lF}^Kjz+3=APy{b!uYo>4%}yF|l4) z(Ak=DO12ou_ujN#+VB?JUqzz-{Nb9h;7r7dn zS#DuzrP-LA(zi+sLB{MG}(o-1UP516(<}-a=He*DzD+OCZPu_9f6a8RuK}CZNm29yj3(>c3 zF%s};*q4RF_7SG|MKYC@K^VYZsOFyXi)qhFOxal!jgAW2nTpRwKYB(FeS-8|VV;NL zq)dXgoP~>kZ^VhO=8Cw%wa^V*$xDf5Y@S+W?5r{il@6iCO3HwFMOv+Jv$`%C^xaA1w-hB z6kTc-7QOWGnL&kLnO^X->PYgHx8r&dkE;{eJg4sLYJTtgg$mhngF z*(9#LYxjF&=Vd<-uA1PZz~pjSEUe=<4*DcnJtm9tCE;gzX73RABcppl&x~}H7#g)h z{5cN#EF!P@?+O#%y}1~VB(^`o!puu z;r8LY_^GjOChl2(D;TRv86rjIk|Jz%U6?SVi8z&EOvfqd<3g{u+uOxU0IX!Ktm_lY z9JINJ*=b%{-RD&zQGi>~N>Zw6L_NFO94>4%F>D)}EXD%V9cz55{ogC%!_5#8j=1NV zKz!DuBZO@EE8`~RN$WMDXpTq78x9Lx|DLz7sMQXYw9EQ5 z^R?Q8L{t~r@r=tcis7(4;HVVgBkzi>PII9%Iq&*zzSt5DqiXb6X;3Xdih-)h>}tny zzL>M4@rrJ_57cTtlm`S$#ZRFXDDBnd1Dqw#UojPfVeIXpH(HF8rU8qQ`~OZLBx=>7 zjctuyq!l~Z(Q^=^87)Sd4GdDj3)$e|zJ>zUge5nRo0pZZX!2vC<9pwkOdj3(8rb#c z--cX8He0eh@dz-&#Xjxl#)_lwqJ_Slb*H*T=YT(aQ~Qh+kAf?`j$L@LlnIlO96&Sy zJf+*;PfX9pUJ-!@G`nayi~MsduS>ee6~6)tG~(o#fjg;bwVCzKBW8(sGT#}7HVwPg z;7BUahP7zof=wsa6$8XcX+KM>dy-j}A`U-^q=+nh+L+oM*_?~u8TBh1T{7V($C@>; zgi*6iWdxN7#tOSDCc>#(5GotxT#?(baD!&7Kz@{+;CIjRm%WV?Wz`6(Anc5{ z<@4w#$?s*(b4Tvpb4ZzE#g9e*-imf? ze&2_@av0}nb3RdZ-`{gHL5Xg&OwaJaJ-UeHbWoJd2q&<3YyXkROT{; z7F#z4fHjm7P${kjAmucacNzp*ltxFSCxusbX*_4?u#|sjzexnE=TjFRd8-OD$ne|1 zjw#qxI;ZL?-(%>m@W_m*33I?qi5ncW$04MZMj;BM$AD7@rBs5kIS8L72 zU%8)^Z8{(xXlAWxI>=S2M#~9UQn*0kGGc+DI##HVsyN>?;%Qzhx;hNGiUkqOf@%@V z!=mfVs86+HuZ7j4IO#QoJZ5TxnhR?TR1g)zMJrZ{H@zFfe7@{>VBzLV&C7)Dw=q87 zA0^*~zSbH(M9pGs^fs99e0u5bMwg5ZFh^{L|NVt?F?O-W-(n&H2(O+3d{+t=duKN*(N&lCO2IZ(>Rt~er1+Q1FN;>6RK0} zDXJBKg@2ifgAf-x(2IrjMuUEj z6+lbC5e0B!$RDl1KCm8~5r~GP+G)V6^UsHh#lg<*fcuQ#@D#+EHa{GSXoWDY=_zZK z_w^i09x7MFQ;RU!^p@s0$jgtW{B%&!lpDhXVe!helR{8s%~w&rNH*GHaHjk%eRnCc z*z5&qmf+|WR&l_W5*gK@Xe+MQc0qO)lFiU|U&DaIGJ8t=tWxHl_+d|h86aOTTj+xt z&=#)SD7orOgKUbeqjM#36T=)h0OTY!N>vXyi4G2UfZZRy4W36RkY8vl5Ce%<9pOC! z=GCGEW(0j{96XPvA0NZjdT;phW1@RxX)4Eos5deSu^mV~>V(PDTK3Rgf7!4_#jh@|v@9}$r*mbBIQ8!p5 zb`sG;=HuA$k!mWMYLu^p4*sRhj$)J;0~psn6wfW$%9+-Mv|>lW`-64l1LCX3d!8TY zRBQ@P&opDfnFj{N``Zs_M0kVgp=$E>YPhnuz8djeI_IJUX6JbP~|6m znD8}xf?!^XXc>5b&6*U+24`4B!V_cBhC&e=v*)lF-^*ypgZ2cz_(P;HMGd7+%yXmK zzA2->cJ%t`lg`GS-_6sswiWeUWk|R5dcX}1mFN#T^_D?J-Aq4RT5)-D_#j^}B&OsK zJ_rPc$)i0&-LJ{Y5N0h<6(JOH?5I27kv_ISi*YY3JhQ_#d4^xh%^fBGgn^6j+{qW zDuZzB+U-p@AA=rD`6#g&tajhe?Z(iNNCgxcp(>hSF>Ao>*uSWBUFxvljOse2fW!aw zFO8+_1V347_Ub19N zyqT-+n(OI)-r(NH>f1JXhoeftek=HF$VZtn;|98@RYgQ2o{}wXrfHr>e=T?qSjf?6 z2u6rv>965Y7dOH1h(na1k zjQL~2-cINFcEmt}+1eMCPuQqS-SZfPUhWuJA5gE1*@u^Xr%IDTnNl@W<=DLS(Sj|_ z2ybE;hwTIqZejl3LGS27ybH9dwNI0AWa`oakm7ZA28gA+63(6HXJB6?ScADqe@WHX zQtRoeS5`?Vs+M`x_~4mo^R7VU<_BbpcAk>!vlnMD)!N2+QI{jPXz;TQDn3_c^m{_E z>>A~>Bd5oFQu%GA)Za}9F$A8Hchhj|^60KH?Y>>(cEPwwrGGnr#TOhv3n&GOrD zG$q(!OZRZ8*w!mN6W%GvTmaUwb!ZR1;xq~j0)~QGE6W2Om~$pKniYv0BC`@oe|E^2 zde*y)kjWS`QJTIbkY3G@Rjv(?lAbUThP1(wDB3@^3{eW;^0vSi9tpJ~=I-~*F9sk z<3=u5Ge1w-6Thv0Aso$qgKZi7c`aM$JikW8k&S%wAknioV-)#}O|yuZB;^^!|8vD^ zrn)HYamvy`ll_48QrS9w2)IrU!>$>#mV9NGm%AG}zi^Kpla zX?MLfMuqH=JY6IgUW#8lCom>rW*KU}-1gmL#Hl-l2c=;2=r!FMU7xBDCdc3mL66;e z?w!G?j9> z%1xZ`c2~ouLYjKItJA3T8N3?nIHc-g=L(&!I>wq7ioB5&Gs`b1QvNJHn-bkAQ-+$Z z#yW(LffE}=Aue~7tmRXLEdA|27vrw*6tv`US8=XYId-}Vmtp(OD@%Aw$gq8)87Rf7 zw%SlvEhsFSJy!hZYMtn!m{}V(QOc2$x8P(-y@-F6zWROQ7OsS93}+O(rb;kGW7Jq@ zoA=tQ8w0M^qpox^MmX83E$Y^zqAd91f#i}{B_n?*_&F0|5Lp|PD_D6$xx5g>GuMw8 zw@yrx@HG5B{=`0ze6?`*0T<6B4z}U;A~T=#$@w(Fi3IYdj?i!Z%vnSD#L<}tA1hWy znqyuEZlGFF$J4XW_@x)Jh7f+03GymgVVX{vpR;SsuXKuoLzVTQPOVJqQXeIrjpQN= zUUH$BuKprb6tw<9T1Ct{-H9SvGJ_6($M5w#R%J;wX_h8ODtUQZLP%uah(6A}24K zDXH&7Xtbgej=(JoWMyKq>Cm&5BkgM;_n zDml+un&>1kij4i|l6KZJh#hr}yht1)VstlNVpD_J^0dw8G*0qf!w6hfMkB&OcC+-d zw-nEV--@nwgc~#To;Kb0)C;?E7-7X&*W`b6sG$ha*9}^r_1g5=KTtD~O)%u&KfpIO z2Y@~tB_WAuj|Z7&SQVw@&M(4!j$-4FQNhCG!!X`Li9wT0$R8-l{IVT}^m%u~1|JP=>@=7=;X(xk(ixhiC5w1eYw-AF(cA2 z8PUn9k54kFk=TU>lOV>G9?G|`ga$YrF%CH3M*e$we9`HoC(1V{X^hgrGO81wD-4d{ zYf0!X-Ch_3X?5tlF-noiGv{hds`NwFVjJ0=QKaV5(!LH*#UN;rB|~D=IdR>O+$@Op zIvwa>Ksd?2SA~^nV!R1xO2#+WsbI+~D|&AE8$OFQ8Ovs#vy?d8s@cHa6ac~bXjV=o z5_8&&H+FpK&5MW%4(sqM@Ot<-YYzTx!&Yg*G!Pg3&MY9up<;bL)ukn=KZtu*Dkg%9 z7RkOOZ&O3u8=a)GH9(za^{(Otw#QcBvb%akj@6(0Yq>#L$+cU1LPO0Km>7@&=%QK`Ba>Ffc^x%H@#Y+1g zBPo!u|1F2}-D-=Z{d!~&H0}gQN`6nn+dJDZwf(VULDO+ySEDcyXN1z;mZWHSY!AH) zE~Xh%J_`9ep{!`c$|8Ik%{h`DDcCk@rCF`~m7;AW0!QAHOx_^0p*+J(L(HDHd^kZ+ z)?=VYHTSN^B!#OWvlM!6JYsyR&YdeyW*C0E;*ewTNp)Y5qeAq)#=c4-cCD&BZ+6ZG z>8+}TaLow8v$@_k&)?=KGx0;;lYz5cDnYyf!PoJ{#n0ONrS*PaPhcleUfPd;;A#mf z$!W_$wk*zZN+)aYh*;-a580qy8udzWopTeUB-!bWC_j=l=^f9~p+f7@VczoZnQc{Z zaT#-5oj$h0KEoMZi35hWN*y=^Yy#~;5Em5N8a~U2j+>D4RH^p6Ufi}n3~9L=vha9#PIuOUVvY(#jTJxhI!76j3N^ zC3yfY3J~T8NBr6jbb|CD^{S{UO(^Ejw601-S)9gyFI_~WX0CEb%*7Q5+&fG6~K4pl3A5xA7|iYIjXN+gVydior|ImTED0LtJDVJH8E#H zuoWi~oV30Re^o#x2sv8>1^yv6s&CumjMmW}6O!JXa(E55z~sqR*d7(A-%iQ>&NXqt|^IXJ%Vpm>#n zYXF)oiGegusUwR@YNDQYx^9>TK8Pj!F9RdOX|g!wl1NIOYSB^k5D3 zOp8@*_j|F~OSUlsZNFJZX53vBLk{6080=34K7D9#-;2R*gF*G)O3>Zd7F5`Nz0FdC ztGMU&D7%hN2b~KVOleoObH5=P2NB-|GFj}cZJV#=@K|pcnqv0OH=5P5y{j`>n#~A% zMIL3z{CT5AaP5g#Y3pqxS;q#$->F`>a!D9iNG$Z@oH0A9kBbUYrvsoXwB{IM6MxOPUD!w)XkbgADRP}U!$Xf z8s}ghAk37sN??=w@T?vdO$n>ywabwx;Y{MRI0V<@OY%LR_Z}O=L&Md)^QuuxbKz@n z88GGt*OWgN<`5-mdU#+47P3P+O&J|#bF4TRwH3UG!R=5AM5`w93Zd9;CtRD;II_hbf#dokY$GPF_q?MmCQgJVQ*+{e4w0yTB@9$q z^cLe_b?}w&uWV*(b=H20gwD=wT|97XHDF~_<`>KtXFZL(^nQsuYa0A5xug?IlD;n> z0lRAXgYzUiyo*)5T( z$3r=mE!pjqawsX}PxEG%1Z`_WLW>vfRuK_0ItEH=raU04uiy@k%`4uuK2$_gUd9P6o=(s0+XJ2=O8 zTunI1??MUhO0wFS9BNtDU!^}DO^cRiwU%-TI3j!cLi>)II=vY_juh_>QtB9D`gF1i zsD1jienb&wH$Jhj&Rdb%A|rj{CK4~!kUy&2!4tKrnHRP5O+6$D!He4Q`!j4Vwd7o1blc!@CHsrPwzV+R`FyukJClu>B6^tKYdgL|eZ!)Z?qq4K_V~xLYeNL#g-F?hw5;^+=?|!hEN~$r2RhV=)rDptKK0( z#|rM6KmCZ)gka)0sg=gDOskvR9)aAznQH|$2PgTDqf&Vb-B;`(bkuwJnf_rj7{Nb& zGFlVdvZvhYin|@O`4{+RPfdDmkU!CaDp2Y&7SE6CRnmDxAHMZVLireMAqc;J-|7lH zhuZk44vr`P=-X2l*Z8gc5`2M79}{B5^n?8C*6e3q{Na*pO&R4{5UN0fA#H&r$HEpV z(^Lt1%h;Z92SxLlG}FNfBaHb8d(=ExCc(=*iOR*{m&YTtjt5O2U*V0N*hi%>q=-X1 zXQl6j#5xc+(L31O6NEJU2599s>AWGzx)k9$CX9IG(DBNH~HWY+~Rq~e^BTkUIvCg zD0+-?Qk4xcnWb7JT9#9;97%4$u~_Jq_Et!5@0jYD>m+7vC91#-lsxu$_Nw&<4p%IB zj9!2C)IJ<8{C)U|tPN+e9Rgx}q~+P>N)P;p=tkH}NvSDFNl~b2sLCoR%lw0G^MX=D zAL4*0ib8x# zF78`F1;t*^z>R^Cr4EMaYtj2(M^lH&@DI|v`sKuUSMXOi)hQNK3eTMAZ_vH0(X!+kuxuinR-vT#-|djg4nuA+ z!5z9t3-OV7=MWUwKI205rn3vnHJ3c#)plFa@sZif>@e-dKq;OCB(l~!uG^dzr97mxd{xDFsh_sWMhE{SYztZc6J*yg^x z04BE{1p(nQ(0|yvikh<4KPLcEKu90}hZf_n^rN@wDFVc@L~Xip=_;Qluh_-cspNe5xMo-XA%AmpD6`kN;)TmXO@ zP>`0;@?Aa4kFQ_lK#7{gVYYA2L$+PLdu9J#zBI#=TrN|6wnbDX&i~_Io~a&N#Rcp1 z4(n&Um>8)M%*z;<{ZLYM;Y`);?%NAOARvHk0Q+O`L)yu|RI2 zui?m-ux9)K;tjb`uaFG@j~fpp*qAxJ^|1%znXU5yXUJ=Q&=wV4lx!G~CjOTI;OOQ; zY&!!^@^&0RnKm-+b$TC;jnt}dMviQD0`s!%3=4H>_r9lq{H-GBdZcF(xG@+0{P*yC@2_7z%msCUZ=&vC4sRZC zKB{9lg|2=UJRFRCYZwbmOv53%+1I-aForQJI`Gld1u%OW#s&1oBaf9zfyyo`*zEdD z*us!zxNSz_Rv_#f!*_!OY z0vCXSXKV}dZ8H#nQfwh1a4=?i++m2jwYUN59?6ix=kinKe`?oJ{SC(A`)Utf-DyIk zbWLh#hLHQ9y-}mm%t0*RW*&?^1_IJSF^wf$fV;OA0tFkMBPe+^k;x@tzq85N{;E$d zOz`4g6#xGuUR|1uH3tKgv&`@Z+>hyhkt*O_w#Frk;#1rL@*;o+I&>cPKNc4%^YV|= z11x|>U>HPzWWfeqpiYoWIs0tcOcG5;WR)g2HQ1ma}F zTHc8Q{)J!sNP2h5eR0611iiT_+p$>@R~L)`JzlRAl56w|g&6X3I~f3UmNv`Dqd_;~ zi-AH|AdT1j0=Bml73+U(^M8Vw{+$Wt@HEV#PQ-Xt4yos-#|1XEbMBG9W2^Td3PQkS z3yW*$USsfoT>3xW6@VReLgN}T<`n`kSO88yAJ_vDz?}HKPM4K{j&8)blKh8Jov@dC zOi6Vd01$@-=z18QWPu}WFaXSe|8I2szd+Fj;+D|j;l-~38f0Mu7K)H?o+3^&RG@+c zx<2&t`J9>t7rNgvAh>oUZ~#a*keP1EA^`J%{BP<~B=KQU$z9Nl0brq%WcyF^eo^mG zR1yLt8vy#xh_S8Ee7OHi Date: Sat, 28 Aug 2021 13:06:47 -0500 Subject: [PATCH 28/56] added textures from BeckonCall. --- .../textures/block/raw_argonite_block.png | Bin 0 -> 5743 bytes .../textures/block/raw_malachite_block.png | Bin 0 -> 6510 bytes .../netherrocks/textures/item/raw_argonite.png | Bin 0 -> 5491 bytes .../netherrocks/textures/item/raw_malachite.png | Bin 0 -> 5684 bytes .../netherrocks/textures/item/raw_malachite1.png | Bin 0 -> 5594 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/netherrocks/textures/block/raw_argonite_block.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/raw_malachite_block.png create mode 100644 src/main/resources/assets/netherrocks/textures/item/raw_argonite.png create mode 100644 src/main/resources/assets/netherrocks/textures/item/raw_malachite.png create mode 100644 src/main/resources/assets/netherrocks/textures/item/raw_malachite1.png diff --git a/src/main/resources/assets/netherrocks/textures/block/raw_argonite_block.png b/src/main/resources/assets/netherrocks/textures/block/raw_argonite_block.png new file mode 100644 index 0000000000000000000000000000000000000000..20d4d106308cc9cb1fa2dc6af04fde7e31599f78 GIT binary patch literal 5743 zcmeHKc|4Tu*B>crBxynA$uyQivodBu*1^cwRf-rh_lzmCm>FY2*6Jbqnyn;+l2lSk zmLyM$oYcK6YTgw&Yn6;dqD9wMHr(>U8OHIv~fHyS6 ziiZy6!H>iYsZ8wgKKR0wA*nxF0;682PF^Nf739%PO;bOf{?vT)@*|A~*<)M(c!#;& zmeMXcd!_@@@r9DJFYeh5o2nG_@%j}`EXS?NDW!y=HoYL*f!uc0kBTe$O1&&b*E&Qb zCJO}kkFI4lu@??gYsKN|F-xAmzVk6c-J>(GddU0i+I17R$~!VK%~umr^2Tzyyi4Rg z=F=NAxh}punSKw|!-1*?uf$`a2wN5y5Wkx#h2z&t1?yD>Gs9lG#Qct=x{ zwObS{Z=OW4IP8%ny_ZmE^Pw{g%QUGvzg3o#f*WaK-B z`ks4H#HH(!=7lX=u_*0;0Sq>H@v42zbxCAQLQ~HNox9s^C6%h-6wC>IRES}_mM`G) zu(7~*fx5jNawLBoNeFD$=G9Hy3DpQgh3jVf#wcvs2U~YQ%cg=bw#+)invz;%5h!YJ zU8;ROdzlgSZvJS{)#wZ?E1e^LG?=2@nh$;D77*BS$k{q`o9nkS zMaUBG7fwcZujeY2-S6QXG};C0?5L9WSX10g z(~sBjGqaEuMVABOn&;y<&(?Kn6cuB}HXJcYsJgc=xm+n0^4A%2yLRgM&OqO(4*uCnhd+9YP7}IrB#yT6H7x}cW&zY9b7;HPESl=S^ z=FuVYpDIURmB3reql;1;ieiewT;B=ol7^he*`7+nx>{4#-XSj89V&OzRAuf}-@Ku% z3xxkqf@f8+YsF1&l=8g&3$!b>Yy7eJqgBl;)QPB4;Q_it#i(-~PetUnS!!~c65q$|e0qu3`)X76^sB;-4n~N!l zQ{_GJiz=3fDh=6q8*_A{?GzjCCp9H+tam6do@o2q%WAN5*f89w+EwMevrbtqnGz3C z#rGPn;6F-C-t~UGxy@*6Zrc%_jJsxZXw8EGYBgEaV30Db)uMxQvOyW>DaTA0(x&``n1w(+nfdk7CZGo#yDCFJRV z$Xz3mq3KWKdrz5mSjl9a1ALg*J?Dp678&z96NV#3^>lqogOS}3h|GSrm6bEa%Ia&! z2K#jW-c(b&W^?rxAGZ>+9#p)vJf)E2sk|~ULr?;^jHDueldZ{nyijL8U z_mEd*dH>=V@s771@0uIpxf*`A2tUr6!PD9K;@P zuUt)D`U#T|7?%@baz5Lpbu36p$>$B+u)o2i7Ln1ngQh| zoE*^G-ILycPU+a<>Q%bRa`EO^O&MkEi4BE|6_mH*TphI7W{;c9`adl1PrKnUPqTHN zp7T0l_^8>3r>AlXaz*L$T#in*)R@^odXaa_9=&^ihJ$y6yfNUHod29jLQhgcPL=FW zj;!ZAdvU4cMrh-}67+}S%?JAJcIH}cQmQLx#{*GOJC3s2{y9~f+#wI6dLw!v@_#n^ zN1g35u6xqk^Q3{5J2eHlsV=yws=huR+*;Mx;1;@#>Oi9NI7k|U=LaAq96q?kLLeq) z5 z00$7!U=mIMS4fhW!e?+v;JtJh1&7Uuh<2O8w^5y8Ry+X!GejC9(Fn4HEylt(L188W z29xA!Z8HY}KAFP(MIt^4g$fQ1Mg|)oc>)#+LnIPWXex)`e4r#WJ_>_Gqc|MYj~YS| zSqy^AIrJYjgzn&*2+9=@@`40(fGh^MBF!Hm81!%Y{2)QVOgIcW3J3r=pr{bEiuuW; zErsg*O+!ini_PKBXn|z^Bq?GuzmxToZ_=5WaDH?IRR4zill0fvXM{m1DwSl-qX$Xd zqgb25rS?e-9-Yk~&D;|G@C*Xhzz;#h0|bO27KcX=hYZNx%lHk{0lz zS5hbj2!*E^;V^U@fG}cW@CZXg27n;oFaUzaBw%rdI70@8X*dJLpp$HP0uBvKC!0fK z0VqC~H8UY4oMholF@x48hBrqJ1TAH*{L4X+zFdCAT0HBF@0(TxSz!WZZ z3MSQ@DR7v{Y+CHtLQrClwC3lk-VF$xeVSba0qmJ67;L6+Ni_Pb5g| ze;StsfGd2iq`r=`|3kWrXaoiWPp2V_aDE`iI072sN5mN*uzqwV9z!s~;|a6GeM1-W zn4(~s0I*<>tpLSr!qGy#DnxMQ#+44Q-^!clXf zOTxda>o;A$#K12J|E{k8H@cwTk2?Std;MzH-}i$DAvwRzw$_j@((lnLrRm_v zBEFrc5CTzHF1=(Rx%q0~puC7eCCd*iR9A)?zk9Ly2zcDhq*z$vwmsov9x$mcyYN{qQEVC~Xw+g)L-|D3IBl51AYb#_$VV|p)M4s&kGw$j} zDG(#MSaaby1%#d>Pxf&~yIb1AP zOj{q@I8sW;=8cque&eHIO z5BpY)wQJ!|ujx2`)btPJlfN3|-TIrlJg(TcG_g;UQ%gf1P|sVayxn{C^=f12Xg_x+ zK9?>RsnX)B2T3Z8e)1$nV=%X&fumlX4k>y2*!-jK3IE*4?w++7hnX7YosCW?{m1g& zX-0wDA5!YbcVb!iY*HoP9-Ep~wOP?5`(RTiN@>aQtNZpkHRZP>->%5}6DS>OHiKpM zrp5bc=2vdMn!b9v`t?en_F=&V%5tLSCOL|w&fpgrJH=JbOtY6oV9p>EvZHmSrEm2A E0tvkE5C8xG literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/raw_malachite_block.png b/src/main/resources/assets/netherrocks/textures/block/raw_malachite_block.png new file mode 100644 index 0000000000000000000000000000000000000000..4175168912d6c4a9e0590f465210effc6253200c GIT binary patch literal 6510 zcmeHKXH-*J*A5*i0wPjmBt#t%Cq1MQnslW}5l|FEauWh1fh0fxML_Aj2m(qG5dj%Q zK&+@Jq7<<(;($m|6saN>P}KJZ9miSU`)Ahr-hU?RCim|0oV}m3_qpdJIyqP?%4x|# zAP_}c8w+RfUs-g?N`t>Tb6=TjetB1gu8VU{MaT%-t04fLz1fYPB#ehJBeKqbo zv!;GkSY)bsif^Xe;F%6pO+q^y=icP!M{KIxax*v}MJ$n1*?RbMZ*ls9#QwB;tns=; zl2x)v@xBl##kz^wPD4+VnUAeSH}fL-CPV?c=+f@>)3X)DlX-_umZ%x8S}~wA-mCQI z%-hla%^V}45ZA{>=DgoL`B0`$KBp1By8d`Kyr;QnYSQ9icS>PiE$55S(X>|T5%mRG zb?4(>K8`}tbu2F&C4+^ zb$h>anSXdi9j7{?)N!i!bzWo=;X-p1C9?a$4T_`p#ZAWI_sZfCca=iH9Yji(sszi}#dTpyeKBslMtz`?9%Ow|El2>4&k(or`; z1U;8-*4{J*ytyzTZ+|hYz-5I7=U`^qX$@)|_UXI*URQRFg<0KF^*rx!4N1rn=O{eC z`AeCptkH(F7Rh<9!7tLa3ewjPdY-=KGqK~CbYGppNWzADDbZrxhx~K;c0-h}g+yT! z!X5D|WRmFF{6txz-26rln+)9VG2(L941_N!d`Z$RjYl_+SnyBDbArw5O)Z9QE$g8p zhT6>^DVyAu_cXfdZlE8lV=ePXcQD&ByQuO;ySP;_x2Z@rt5 zjUr0W?x<=w9uSjkSbfA(cjl;OkK&zxkXuPZLx9FJoK{M-+2HNictj|Y?=8eW`Lf~3 zW9l7+@y|-nJ4>bsou8gfsh?`x#_lbvu zRZ*inz`^+~C-O~h`0X;Wo|n;+X=kq~`N@6m_0!6ZD#W+xCW_l0oiep|-odtjjB_&$ zq&~r!*V9aP^+eZBlEoOL>0NAnAo6obqi@Hm@GJQBdYBbqS_W4iMeZ4?TR3oA z%6(@El)()3P&!1Q@=s42qEPkxO{cNMu<^8lpEPvRFad@rz`QBJ;fS~lu z$SvKecRjZ*Sq3B=?@^lS(acCFt#jE|&r%Ze&U(k#yCqq>r*Ky1ZkJ|N_c%d?*^;f& zg9Z0PARqR^4B;P84j)denDcz?P-Q`&#VyZI9cS8C z1*JE7smrK2mveWKCOxMEf@=ceV&1a%k^PX&lON>O`@2^}R9v@z+hjFzxB1L|*H1#f zhw`UWKOHo<;=d1a>hgORb9+OBP>aBY3fbRl&rUpWAg_%HI(1%+n|IXdmUk*N(j|$j zcjM>+R%~hq_tvf3@frJ$37AE?WjPfq9a3+G1T!(mB+jg9(YFo}F2pTX48NnE8|XAC zH;YJXLY106-;2#O#y<7^^>TiY8Y*4~_#^5Pe5O9`O8YO1n-oS#Eq6=a441i94;B^Z zFG%`st*uVGe(Y|ATxIg=oUEQ1SMBnMGLK3oznkndV(~HHb&cNwVSe1&&Myzpl-arH z7{T9O)c)}ZG+d36ihK1UfggQwryru#?1HAN#H**v^d1j;#f4~>e+XkV7#<2p!D70$ zL@^6+cm5FOXCQk+;9$%I?7@l9r=#?z- z%gs!&Y_$tQR0FC)rm}84tEQdsS#|R@j=bR!jv`rB|vTud>6y*=`-nr0<%^vw78L zS-0K9*S3l4JL!@lUzyAg)Z`Zz2(rbum3(YHYhnc%MBF|3=ezfHY=Q%11{+x3xOj++ z`e++oQy!Zh)yy6mxln#P;_B#f)co0Gx>S6R07OUcEMay{)tpa%AOp4E z1s{aS#9#G|KGSP>sekZE{}pDzr%#Y}ZC<;&_J(9|C!@gvcPt+Ec4QitjiA!GJ^(_< z4g_~J5D3LY7)Yi00|KZIz+`cZU^5r5z@RL;5zO7d9%UbB4*0Tc!g+v8xPvP#+@D6G z!%U3jC_*v_zy<_VsE{4N;gf|%uq9kFcrOwoVbCQLfxi*V!`=yM&gB7690G?x!7YWX z5Dd&%4oczC8DwV*t8WnClM&2UAP6KQk)ffXh)^to%VQ$ZBoYaU!XPmiIA{Uqhj9c{ zA)LcsD}wlnVFB=IJXWB9#pOUnm{cEbu)qig1NG3q;$sKe+kc1W@V~JD@_`gm1CeM1 z3dv?8fAruBEJHw$Zvp*R556n7@k2TTd~Pt023Upw9KqTjA?UR4{(-@~fTeWkG$arJ zut8HkI4b%dLt5L~JAL;MQNU!e1DCu&vj1TzU@`tC>mRX+G)w9H7zpV89rqvBf91Yp z3|iUSlP$QkU{QFs7Dh19_+&bl#-fv#ZV7+^iAJSU;UpRg569t%G&q$;1>iI~ib2IN z@I*8N`va6MhcBRVXn+U`1V^wy96BDuz!D5la4a27gX3s812`3pqQhxu0-l7&67U98 z`VSC}JQi4$)PNtO5<$^HC?9}f000;tI1!Bj;5Z_H0^_2CAu&*B8ir&*Kmo)hC_0U7 z#pSW7;B>OsR3?B7^MBErdLPPRrc3~M}5HW?qpy4PY97A+Pqsay& zG71GleoGc9>gm6-r6B(gACx779~J@7@2d=4T)?#o`F*ka#+Qh~|KaD`Jp2zw0HJ>l z@~`;)N!L%h{uKlN%J^q>{iN$(G4QX9e^%H38(ngLA9nx_xC06W4>M@bt8c-BkhITM zYYWI1(YNGsMK&l|7HH$ihd|_2MVA<);D`n&lo8n4Tgr^eYAYK;qC&b&AP|Z5wiaft z#15l-U50VrO{<0D_lgr$j24Knn1L#&_)VfNBqm>DU!|T>p|JxX zJ^#70za%M9*{*FYhrp_Rc(O@9Atv$FouP^Om6mSHWMrUH5k9Y{hSo#wbZmU?u-u9L z`G84efkWlB1J2oZoDL{?pYJ5z&${HDey1;-K3LIS8a|n;m2lO9n>!esO=>dLBSyvh#I>z>pkv?M z7Pd^RrS?m10!6iA@5CBT8@2ZF)eX|=m*4%i&`Pl!l%8(BK5HE@|B*90)^f@PvOkyf z0?`^PE;C+QHJLjhIieEtQe#kY_lV*`9J|`e5!R^_n(M1xJ>R!Iwe`MYl6l8Et25eF z@fG3p6l8#By@=g_MdUm#U}f#a2?|{i~mS zEJ%=p4DV4ujt*B^U-Y=Hail#f@-rz8*(?V;H!6L378NbX>9I*;cRcU&?%lT13E$** zZuOiAgXq*9`?rHV1hKVru=suRo|yjt DH*9I* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/item/raw_argonite.png b/src/main/resources/assets/netherrocks/textures/item/raw_argonite.png new file mode 100644 index 0000000000000000000000000000000000000000..812e7d9640dabf99a40c54723deaf1832252c214 GIT binary patch literal 5491 zcmeHKc{r478z0#eYkRN?!6{}RaEsOPOd*YSGaNIGsmNoF^X&D1tkJRr&$rju{@u~T)?Z;gWI>izj ziPL=Fjo30Sk)GeNe;~EwQ1i#5iA|{+4=byo_p}$TpYA!Hl)9aHG$HFMBCtpKK^UrR zZ?h$;c(%Dd>#88TBr1P{a*5K*uC(cKe+Ny?J#&8U^82sdUWz{iylL1PJ(^KVZ%-H2 z`C07^YCxDXI2OmQht6(rT~LD73{AvzoUrqwYE*Xvj zI4mw^zFOznD{E5?$+c4}K}uSev}D_Kubj1r-om!?cUE142IsJeZGNi4%sXV~k~#~# zZ-DA$eU7w?DeWO2I9=s&L6pN!a(lgTl(?yp4L<112z;BJD%nNSSXW+^+mJGo@0vh=HOb7Yp}!TsWR$UYS=uTuxKwTjSNY@ zSA@<~)4AzDZE!#mmAGTtqB9lA`Z-P39&?6-QGAnjh&oP#*y@^sB=YudSx+ObYnYsv6b6(g`K zbN&(S*v*@ZRygEoHm=>+;%Mo4gzf)$VVlJ3{(?gpJ*)O_p5IaY+t|kbl96^B)-ZoSX0j+E=lzY7x-VN@ zowcF<579`P%1nd7aQ7*H)+EOy43)fFGb*FAqx+uJPwP{?vzJ{OODVlR94?yidUxKm zF|W%n!&PFLQ4xFNN3T7O>o*SPw)@-_tV`Al5;CKLjXkzh1ikI= z>=j;bt%(iP$+~azl+#jlNL+Wt-}A&C3T~ix6{4kjJa$0Rsk=+Nb5#0nsjv;w zYk!4fJx^b?DN;lNL^PqdupvD^A zUeiGJqwi+MB~l7K87~hHmL$g(sg1r)!UZO$4UQF2oqpl8;F!#U^f8Znd8CDHLk+YM zjb&{k1KC$p{=&rGU%Y*$Qqa;r2*XETXSfeDKUHihxV`0J#p_G7^XH7pxNS-Wo6knJ zpE`Zdue+x}G(9bE-DR5L_SR1-8j*#+a>l24)oRUnwcj}(fl%7Tx3zU;+1h?y5#e<( zb6c{t)Ae7BtGBr2+M8(w>zqu=p>NQg6}Zn#{~D8TUNYn*88jgCoj4nfRXcv$X|iXn zx`EH8xf@kiJXfx2Y-HWCU-@AR$5;39wLnI1&(=Gam7~KCp5%3?Wc#HhC)igz2d{l~ zxiV4b9U&nw?qIl8X}Ux0iy&?7EyHN5(<5aJ$1^D;qkFn>1L;DKsyS7pLupN6N2oXA zQ;*Z{V-2O=fQU8E{F8e6 zfti1A>Q#JF%R0`+JR>G@)oxQIUE--FImoHHzfw5P3;2w#YmEM}8T~1BYp0mjPBC+x zPuu>SG1gOX@JNO%b;_FT_toba4v4$hnTfk zj^&rS@Ah_I^~w175m9d}sW&iQya(R84EgXD<-vBQgCYSI;EKE)ljf-a3Xjz5QVE_Rn z15lxY0HKr~YK>Ol(&1;h7>7nFOl1DnXb-k4%2p(SP-H9_i^tf9@`H(J8!eQTgv+CI z>>MT`;5TcuuS_PU<8UD%A=nTSRwVJk5ok0T4o}1pi5S=dBMlSEfKZH3YAT1Az_5d) zpoA}$@kK(E924*s1<9<@XjqT>oS#6`M`w&VjKaB#|Z?uZ#|?k`(PMk zGNFI;kh;S=J&prOML`k}vJZxYGShD%xZoFmagZcHQ4SZxK>?5eHkHCr3EzcuWU*bp zc*rU6;S0nHFPQA_EMq0CON=+3$HR~z5Co_e79gKsd3`N1>1t zPG8~5vPKiJ_^%Sz06@lr9pE{@7ji`*(yuCaz5sHQ0dhVG79>1e4at&7CeSSLgs(>H zAc++2ML8+~k0p{78u`G`;c{SV0ePpw017!=4c%4(0Wy)qT_g&yM$3~z$vqVfjUxKg+p zxP=tepq5OMx%B&NLVO`PQ+Of)gQsGMRCfZAj<=u_h-lnou{imh{#>mU?tl2OQW$)* z2*7?5GI();*DBnX#cGl-Ifeh?XL20=#RxF;&mcd9mV z#y`93|3;VA*W(T(g#Q7Bz=xUNuOl7dgOHl{Dn~oSxcr-aIWHBKXo{USND+vsGvt>N zA|ulf7OKlwY7H zj&Dn!FE0;{Q?a#=HCuGNK<~8OUC+su0;p1gGK#oeQsSMwh}`xF!4^ESeKX|X6KXEm^FxH>MeFS_0Z zX?vvOXl2nlm#7kw!2I-Y>*C_5tUfRXyJw9;mq ztVE5G_zjNLr{)>94^?|~6a}BVF|XONuuecR(0})7dh6~=^3q$$A#3gozu&h53~@SR z_SpF-*&fxrAVmADuy@?bE~b=o^&`Ja CFM8Dg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/item/raw_malachite.png b/src/main/resources/assets/netherrocks/textures/item/raw_malachite.png new file mode 100644 index 0000000000000000000000000000000000000000..28925dfd5cded4b28263731408cb8060aff54ebe GIT binary patch literal 5684 zcmeHKXIN9&)(#>?iUZOVgNA@gF+CwgAkv8t2vxk&PLdM{kU|nj08yzTBA_rTh^Pox zEZBw_Pz1yR7G%c4FbE@xgCeNtfFg)`PXHZ#zWc}L`R+fH=OpK>z1F+dde_=}pS_jk zpeb4?S@-yuVRW+Y*vfj8_wOet1`RY|~3Z zYcd$7x3sbAZFlq`#$Zl)v#giV^QdXb*bDpZ$40YS^bQS7SZ(YciNEbzZgubpI=}L` z$;5#2xx)iZ0& zeg`9q^Y2cPvR=*u3N7#(Y~H z`xSTgKktc`)V&&DnOQd-ZyyMq;D;WcKQ4X~F%lFwB5>b*++)pqt)cdg!3$W6feqfH z^>aSJCm+@$(S9tE%0Q6GzIdZtZsCB>E}LaTck_Q?skp|L&Wqk|jflycr(wVZYA$Ry zGf6PG5Turotvv|ll^ST94YzX6I;UsZw%pb$)8{QD2{%2O9IPHUPeP)iPHeuBR{_gw z>8-z{mC5R(Nj%cW6F%yOFVZ<@aWfrO)N#ixv9^{ZyR30b$7M_6@1|Mj;0U*n9u=KH z5hI1|Q7*$S*E27evvC1@UT!OwwYsB3tGE@PQkaq3a&M2p;3-l^JMe5B;^OHiuo#y2 zgX?Tg#>RA`Xe(;s@6;z@;{FP+^2XO4DNCpRnDT!RnW62Ni7?N$Tp3)Zn1@_bQ5lWo zNM*O$^p>^mSzye3S%zKJf~bnaN9_%JL*-t>9iB5`xIXmNGDE**y8@X5xv3SCrbq9F z1RPSgCiR4lqKN#{Rr8M|y!fTzMatl9j_-=t%H=hfu3y(3x>-uyW19Vts~h0*2Rb@# zg;1>CnzszQL|s*{c2ODMJa)V3UEK~Dv05u?^KD&;jc)6O0|IX7;i3i&sqcB~*pE5n zpGpEU&Na7`nchu}eDPx)`FLmiJ;R$rkPTF zihIRIv+Ej_L+U}x5jAVQ7EhX7EqFR)Z1e2(!=N#z*8YA|@CYyKX&d95W{^X-loz%< z$B}m;=}A>genMNosn|Vc$qvBLv{BgBkv7}=^5nDJDfFR(&s5C%<`wnsI;kJl`P$n_ z9^3l1cXgo0R?ojFnvuAdk*dYD=IZ2tEnVH};l_@xk1iU2uyKp~0M^7jU&O9CG%U_D zCZ~j>14fB+tzsNInl5JlY1Lk38R(+hHmEp5*}*=RK+g=hHVa#lH(5cE-VU!r62SqlBi4e$vmwS?REM%A{s!`PQfZ8L6^1q+4<^$Y8U z7`*V~p6gp4aB2rqD42&#>Vs_q$Q*b*4V~1Kk!&PukSz~|cTpmYp8os%-$~2c#%i?5 zX-7R$%MOHmE>8%!|(Q1_NGnkU3h&%Mh3OK zJ&B-C-4OADd-=%OXMWz8p2EG}S`E7`^LwkwZl1Qxs<4DwQl6B&tn3{DPmj^4qBvh_ zwzfK1DE}=7<*2#QDY5GLX%+BCJI?!aUcHCweoixryFFlDz9n(t$6TM~?4NxVz7-lT zbl;swzhkBT`sUrj-O`11yC=@ye%u&z@^<>p;C<^^;vmsvh34Jeov%C}7fp^@oGyTe zb!2WSZ@Sjg5S*I)D(GE4>~((Hen27Y962?0&u{Q;d*09{&s;n+eer|>22;u6yST6z zE-s%IUuelKOWon%d1*ELN<=`Fn~heY-jTwCv~~JM@x?aAEzW$~+M!6vQxhWJ(?1lh z)|H;IbX$;yNmQ6wsG8GD)yp?;GH$u8nTqg_)*o((r{DiGrMFQvGr8mluWRmsm|Z*a z+^%>h28}gdEYO?8<;8C;Nw)uak9*szgdcv07(v<}8$C<+IJuLs=z;#$Cwqh;mlt0q z?A_Iow4ZV{cc=3PAA8p zFjOB*W6Oo;v@>0+&iC})?`e)Ieg7VI9WJ?U0$;HW+9enAq1`Zq=}qH^1ZaROVuNUf zKn(4cFql1EAqF_HpbWtVqxeDxAlH(ZSfEQiWP z(jB$z6*LGy0LlP_LJ%jE(i9HJXR*h{!Pn!l_2EClrAfQ**O#54>>E|;U_1hhyJg~3s&R16l6!Q)Yo21=SFlmQBq zP->xsn89!br5p)gEaQuW2qh-K7A43WkVt48@hLumn92MMFO<%*0P%rQ0AdUdjl~EA zm@h4)GPgtsWHzAxY9S4TUMevDpj4C~;ec+5pipMp zLSAuSx%6N#S)VPG6h!d_;%O_0?5{LseBM7~eHEK>WICNM1A)vx<9?<6Dfek*NQ=p& zxr#Um%J3Mj4oIbc8dt>Ob7|AJL_0j!4j^MuL=wP35!pO4iVc!TC_IIYIY00%%3?MP%4z$I}}91_{i4#0D80G{#%gs+4T zbtMq@WmHNiE(As4671}V1TKomp%PF;9Epmea(N__9S=tU$ZRSIuxFy-a%k=%i2#7g z$rk`oAVw^Vn)ab2oaV%0I3V$8>^~A#93bOC2GAVf3%Me>^q-+Xz5oo60ZKk`b_6WW zj!Lzo5bGu#A$P7VQ5e~5Ve4^Qz3w9Ig|~}MFIjckt9$g zigQ3JArMN-=>|vG&y>ZJFNHLcls!M&^#Ne~%+t&yh~rNWArRAzO9MDFPNYC0$enfs z+06`bq5)wP2+i=>mii>;|Ce$B93F+u#bcpzu}LT*l?b2!8~~umL=qm4V-qN30{Lrn zsfZ_&0}{|F3d$7925O<{Y!FtnWLkf%FOLS5Okwdj6qW*YQXmdTBT;Ek7hqaK^7rogf1^w5pW_ZFgx-MU&|yZuw<#Pt2&uEZJX~QPmEQx6hl?P| zJhA6GDGa77t4#FLzGGZ!__H}a-*uK+3V73!#4Vk z%|=^vveR9RR&}4~4>nPY*FTq&5vkEKzrX)4M1Ow-3tm?F6T;an)F!4O$BG^H0+Nn-o^4_e<}61Is!uaB@N zUP((`_DheN{>nOE(^ccUi!)Up*s5HmlbpfruRTh9ew}a#SVhu?jdwn(mg>3`8HTBj zcd8ypm20n#Qy4PMDu+sFmg_c9=~^Rrd##D+$GgM6Rw!C~TyMvA zHyL~Gk1@8Rx)SuXY!s;t-E z3rY+(vxeWPsp@&tp_A!h?vSjV(otbx-%+|~>gUHu*hDxH4rEC$2 zij#EDw845nfixus)W>hdYF|5lvP(C) zbD+_bTC1urzgj!EtDR4mAzS%ybQPDrt{lbX?Hze(Tvo16(j7V(9J?aV*ZRi%C(Dd= zq&iiwrt#$cdt5GOU!m@QazCMQL!WSwQlzeFv^{v(pB(bq{)1z}4il2r{q6cUhEHU@ zPuW5WWy{f~YshQQH&+D2MD&l3{*wP!9dhWjh8m|Mn-X*gZ^l=vzRpuh>v@j78)*{M z29MS-D?igQ$2ZqeGk`)aIZ*7C$;_Q0Ph7mh>B)?|T`LnrJ%~GTrX$r zEkQSr)E|$tx4mTWXychq+^NWW;;_E`u6Zg6OL|L)?KO+-9b=Xlgxy}YZTj0E!L1qA0K4(-}rtI55s zn%DHt;k88%WGOAYSdC2n<~4yR`jMUlbZ%&TVL|c=-{PkWiQXqp6=p0Z7I=zVs#+_r zqy`Mqe?xVJKcwDW68-EAYwz{Ek;iXs!XziJrWEHMGY#t~iAv9DbAR8hx#yG-rfj>C zF=5^fu5o{d<}=k0i{Ym%%>%JXUL1_7>IS3HZ1=$>*Slo+8xwMpO*(#i&4v0b{aY~` z2M<<}N^cKWnyhtz^-GrP=}44gQuLi-{&|t$B1)bL1kkAv49|UiV!#<@R;< zvE7xUUfxfX6H?QxLRT6_iN^Dj`=2&$kJ)SgJfP&N`ItFa+%!?$wIpA=?`C>hd)0Vt z)Z&&*m16A8f!m|UPPdSYZmImtG&DoXR~{W^#C>3?>h0H-hAi-j?GD#1N3~1c(}yC5 zqm$SQkudHclmaZB{4QzV4(O~Tp zjkA}UlnWm9-x|+a9=z*8X~#qAUQ%2*E3N$xnV}!{`GauR_pi#~R?gmsS{5{DA7)3l zkq8&SGhSSY=f$wP{e2Z5N&;0a7A{_r`tCpVzeQAR4z_m=QsS5pC1)R*Mui}6dE)*q zDl9x&a4$r2%eCTs^i8wz#QqtND_f_Vb_9J?VDt_%hAJgV^8R;-=~FK>~ri2 z-d?o9)8HZDk%4%L#IK&p`HQQQ85}d-y{-D4Fe~&ACFRK>gQw-)!FHLtw~kyj6(n@k z8$UZAisRU#Jf$>oN7|y1ri?Kk?;@nHRyhrPu=ACQ>*G47RlO#X^7o$J&)VEC*WRo< zJ={jLD2VYd?#LdHjob9sEk4d(Pty!86u7L22~0RSa(^OF{hCMX>k|oe$x4P-KKS#Z`Y#N_5e(L$V(YvB#{eZE{`;H`c zw~RLO#dqAUMQQu&*EQl)0bX(#crU$-)u0Bj2PPf-Jj_s?t-%Yv^`K!udeS&9vWDopQx`0`|*T3E)zDQ0@C|P$t ziGQ*oa(6{Q$;l_yZ#0zsc_z)_8B{rAHukcigOdvFz(zyY<4y_jGY6c5-fvH|bw?cv zqG3cUb2Jwv_s*K!{;(^fx;fs-6Fx(7zGJjet-Dj@nNQ~jn==D%XLrY_mQ|)+2vTO- zxRjr%Y@Od)F()XfiV!*P?0u!TMx_Ok=2~%K>6^`>uAG1zG4#^Y<3KMrKQ~tjQ@}$3ECB;V$#_EO zQ*ue1i%9&09?l7^2HRHHDU^v0^KXbXas!9L=t9=@N@HkQw1UrPCyY*7$i-`iNGOj z)Ztbl7MtSf=rj!hJy|0{B@!V8jh0HKC@CH#5QU(zWHK3z!J%$OU3nKd)O9_Ylg{*IKQ)s5j`8pBE{WI=2)}LyhGKQ?&+$fF$ zX1F3f7e{M^B0hyBU~*WLsaqx)!>|O{SfmA+Xo)0Xi6D{z5 zlPoY8==#NIJtz`Gy{JINVo*53ltwWy6sR1CT0qgM5Wtiis)j-pfq+CH@)iiV)(AyX zaE0eogTt*p4hx+lhAbi#JwM&`Uf|}BPah`%moue;!>1aT0x&-Y5d#q*Ybp@r_ff?R z1^6K#G{dJ`>XV%FPs0TQ1dvH&B1vol3rPSO7DxcZ%K+L!{tI2=sKZXvLiVRIL^I zfB3MPGWco{fc!qnpv47RtI(ept7*Oz6#k39>2dfMBS6qUf_xXhKj`{F*LN}SUB*AU z>jz!m#lUwN|LCs&8(r#OwmTpn`T~+do0-81@@r@#q{>+1>AL^ zJ!vdd97?c^EImj#OXA{2oAp>tUsuKC?6N1Pq3tf)#nIl|^4if9EWg1{i}o-leEv@w zL4I-#c#g^Ujrh%jC<<_f(qepu-R*bk~Y= zhu;YL%ZWlJ{Zz60uD7^1Bd-y@N+l_|sj;&f?vYal+5|(B4F|e*5)0Nj581S+`-PrC zhd*s7py+Rk)PwJ>0sZ9_zeKFJTfV;XL5G8{#C%z);Y8v9J+jj`QL}YGn-1J1R#kez z694>NHpj>~EN}bF=8RN-^CnvE3RFYjNK!Ro9=mXbY5DyI=9z|kf1C0s6D_+X$m-6* zkT`x((xE)7^hYgjxs5LO!wyOP1rQ{S^`hqIV;D-OF#j&amhDHixxVw^KDRBc2dP=| zF{>4vSE2C%uIqN2Q|PO=8qQ-k1^KU1@76Ny**qr`%?I)}qbOAi!K`kkVn}w*LaDn6 Date: Sat, 28 Aug 2021 13:28:59 -0500 Subject: [PATCH 29/56] updated json --- update.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.json b/update.json index 5a4af9a5..5bb6ec73 100644 --- a/update.json +++ b/update.json @@ -23,7 +23,7 @@ "1.16.4-recommended" : "1.16.4-2.3.3.2", "1.16.5-latest" : "1.16.5-2.3.6.5", "1.16.5-recommended" : "1.16.5-2.3.6.4", - "1.17.1-latest" : "1.17.1-3.0.0.0", + "1.17.1-latest" : "1.17.1-3.0.0.1", "1.17.1-recommended" : "1.17.1-3.0.0.1" } } From 421aaf1cf3cf76f0777832d28991eee12a276a7d Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 28 Aug 2021 13:29:33 -0500 Subject: [PATCH 30/56] fixed JEI nether furnace standard smelt time, because nether furnaces cook 2x faster. --- .../mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java b/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java index 903382ad..cd92d179 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java +++ b/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelCategory.java @@ -36,6 +36,8 @@ public NetherFuelCategory(IGuiHelper guiHelper) // width of the recipe depends on the text, which is different in each language Minecraft minecraft = Minecraft.getInstance(); Font fontRenderer = minecraft.font; + AlternateFuelRecipe.init(100); // because nether furnaces burn 2x as fast as normal. + Component smeltCountText = AlternateFuelRecipe.createSmeltCountText(100000); int stringWidth = fontRenderer.width(smeltCountText.getString()); From 55d6af8ba56135675c09112f16fa1618ef563ccf Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 28 Aug 2021 13:32:52 -0500 Subject: [PATCH 31/56] updated json --- update.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update.json b/update.json index 5bb6ec73..040ccf81 100644 --- a/update.json +++ b/update.json @@ -23,7 +23,7 @@ "1.16.4-recommended" : "1.16.4-2.3.3.2", "1.16.5-latest" : "1.16.5-2.3.6.5", "1.16.5-recommended" : "1.16.5-2.3.6.4", - "1.17.1-latest" : "1.17.1-3.0.0.1", - "1.17.1-recommended" : "1.17.1-3.0.0.1" + "1.17.1-latest" : "1.17.1-3.0.0.2", + "1.17.1-recommended" : "1.17.1-3.0.0.2" } } From e8e04029be19b80673e60fec59e70e01cfe4e4b0 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Tue, 31 Aug 2021 20:40:59 -0500 Subject: [PATCH 32/56] isolate netherrocks/jei stuff so it isn't loaded when jei isn't available --- .../client/ClientModEventSubscriber.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java b/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java index c953efb4..d0ca319b 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java +++ b/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java @@ -16,6 +16,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RegisterClientReloadListenersEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; @@ -55,11 +56,14 @@ public static void onFMLClientSetupEvent(final FMLClientSetupEvent event) @SubscribeEvent public static void onRegisterClientReloadListenersEvent(final RegisterClientReloadListenersEvent event) { - // add things to texture atlas. - Minecraft minecraft = Minecraft.getInstance(); - SimpleSpriteUploader spriteUploader = new SimpleSpriteUploader(minecraft.textureManager, SimpleCoreLib.SIMPLE_TEXTURE_ATLAS); - textures = new Textures(spriteUploader); - event.registerReloadListener(spriteUploader); + if (ModList.get().isLoaded("jei")) + { + // add things to texture atlas. + Minecraft minecraft = Minecraft.getInstance(); + SimpleSpriteUploader spriteUploader = new SimpleSpriteUploader(minecraft.textureManager, SimpleCoreLib.SIMPLE_TEXTURE_ATLAS); + textures = new Textures(spriteUploader); + event.registerReloadListener(spriteUploader); + } } // end onRegisterClientReloadListenersEvent From 8cbe49ef73b76d19b77e9c91cd486872660f62dc Mon Sep 17 00:00:00 2001 From: Sinhika Date: Wed, 1 Sep 2021 18:15:08 -0500 Subject: [PATCH 33/56] temporarily disable fyrite auto-smelting until universal auto-smelting bug fixed --- .../data/forge/loot_modifiers/global_loot_modifiers.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json index fd18c859..37a8b7e2 100644 --- a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json +++ b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json @@ -1,6 +1,5 @@ { "replace" : false, "entries" : [ - "netherrocks:auto_smelt_tool" ] } \ No newline at end of file From c4c1b0faddabf6f6c9a7a59dc481041443270761 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Wed, 1 Sep 2021 21:19:00 -0500 Subject: [PATCH 34/56] simplify global loot modifier auto_smelt_tool by matching tool to a tag. Added 'auto_smelt_tools' tag to datagen and generated it. Old auto_smelt_tool json did not work because syntax of 'match_tool' changed as of Minecraft 1.17.1 --- .../netherrocks/tags/items/auto_smelt_tools.json | 8 ++++++++ .../alexndr/netherrocks/datagen/ModItemTags.java | 9 +++++++++ .../loot_modifiers/global_loot_modifiers.json | 1 + .../loot_modifiers/auto_smelt_tool.json | 14 +------------- 4 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 src/generated/resources/data/netherrocks/tags/items/auto_smelt_tools.json diff --git a/src/generated/resources/data/netherrocks/tags/items/auto_smelt_tools.json b/src/generated/resources/data/netherrocks/tags/items/auto_smelt_tools.json new file mode 100644 index 00000000..841ecebc --- /dev/null +++ b/src/generated/resources/data/netherrocks/tags/items/auto_smelt_tools.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "netherrocks:fyrite_axe", + "netherrocks:fyrite_pickaxe", + "netherrocks:fyrite_shovel" + ] +} \ No newline at end of file diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java b/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java index c22f95ad..3a3ee5cf 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java @@ -21,8 +21,17 @@ protected void addTags() { registerDustTags(); registerOreChunkTags(); + registerToolTags(); } + private void registerToolTags() + { + this.tag(TagUtils.modTag(Netherrocks.MODID, "auto_smelt_tools")) + .add(ModItems.fyrite_axe.get()) + .add(ModItems.fyrite_pickaxe.get()) + .add(ModItems.fyrite_shovel.get()); + } + private void registerDustTags() { this.tag(TagUtils.forgeTag("dusts")) diff --git a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json index 37a8b7e2..fd18c859 100644 --- a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json +++ b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json @@ -1,5 +1,6 @@ { "replace" : false, "entries" : [ + "netherrocks:auto_smelt_tool" ] } \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/loot_modifiers/auto_smelt_tool.json b/src/main/resources/data/netherrocks/loot_modifiers/auto_smelt_tool.json index 2744b272..481d0e4f 100644 --- a/src/main/resources/data/netherrocks/loot_modifiers/auto_smelt_tool.json +++ b/src/main/resources/data/netherrocks/loot_modifiers/auto_smelt_tool.json @@ -6,19 +6,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "netherrocks:fyrite_pickaxe" - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "item": "netherrocks:fyrite_axe" - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "item": "netherrocks:fyrite_shovel" + "tag": "netherrocks:auto_smelt_tools" } } ] From 4379167d46f6b77101715b4848f54a579e0a4a79 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Wed, 1 Sep 2021 21:40:00 -0500 Subject: [PATCH 35/56] updated json --- update.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update.json b/update.json index 040ccf81..833accb7 100644 --- a/update.json +++ b/update.json @@ -23,7 +23,7 @@ "1.16.4-recommended" : "1.16.4-2.3.3.2", "1.16.5-latest" : "1.16.5-2.3.6.5", "1.16.5-recommended" : "1.16.5-2.3.6.4", - "1.17.1-latest" : "1.17.1-3.0.0.2", - "1.17.1-recommended" : "1.17.1-3.0.0.2" + "1.17.1-latest" : "1.17.1-3.0.0.4", + "1.17.1-recommended" : "1.17.1-3.0.0.4" } } From 8ceca9f1fe77408c97d9a07e3aef016aaf066a21 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 4 Sep 2021 15:56:43 -0500 Subject: [PATCH 36/56] updated forge version, simplecore/simpleores version, mods.toml --- gradle.properties | 6 +++--- src/main/resources/META-INF/mods.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0af8b73f..11e719f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,11 +6,11 @@ org.gradle.java.home=/usr/lib/jvm/adoptopenjdk-16-hotspot-amd64 # general version_minecraft = 1.17.1 -version_forge = 1.17.1-37.0.43 +version_forge = 1.17.1-37.0.53 # Simple Ores: Netherrocks version_mod = 3.0.0 -simplecorelib_version = 1.17.1-3.0.1.0 -simpleores_version = 1.17.1-3.0.0.1 +simplecorelib_version = 1.17.1-3.0.3.0 +simpleores_version = 1.17.1-3.0.1.1 version_mcjei = 1.17.1 jei_version = 8.0.0.12 diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 2269117e..038b3292 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -25,7 +25,7 @@ Additional Credits: AzazEL3095 (Spanish translation) [[dependencies.netherrocks]] #optional modId="forge" mandatory=true - versionRange="[37.0.31,)" + versionRange="[37.0.46,)" ordering="NONE" side="BOTH" From a79ad0c22669908e16a1d298566fdd1503e55663 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 4 Sep 2021 16:12:38 -0500 Subject: [PATCH 37/56] added Netherrocks Aesthetics blocks and block rendering cutouts; WIP --- .../client/ClientModEventSubscriber.java | 32 +++++++ .../alexndr/netherrocks/init/ModBlocks.java | 91 +++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java b/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java index d0ca319b..687b13da 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java +++ b/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java @@ -7,12 +7,15 @@ import mod.alexndr.netherrocks.client.gui.NetherBlastFurnaceScreen; import mod.alexndr.netherrocks.client.gui.NetherFurnaceScreen; import mod.alexndr.netherrocks.client.gui.NetherSmokerScreen; +import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModContainers; import mod.alexndr.simplecorelib.SimpleCoreLib; import mod.alexndr.simplecorelib.client.gui.SimpleSpriteUploader; import mod.alexndr.simplecorelib.client.gui.Textures; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.MenuScreens; +import net.minecraft.client.renderer.ItemBlockRenderTypes; +import net.minecraft.client.renderer.RenderType; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RegisterClientReloadListenersEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -51,6 +54,35 @@ public static void onFMLClientSetupEvent(final FMLClientSetupEvent event) MenuScreens.register(ModContainers.NETHER_SMOKER.get(), NetherSmokerScreen::new); LOGGER.debug("Registered ContainerType Screens"); }); + + // doors with see-through windows. + ItemBlockRenderTypes.setRenderLayer(ModBlocks.argonite_door.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.ashstone_door.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.dragonstone_door.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.fyrite_door.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.illumenite_door.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.malachite_door.get(), (layer) -> layer + == RenderType.cutout()); + + // bars, which are see-through between the bars, obviously. + ItemBlockRenderTypes.setRenderLayer(ModBlocks.argonite_bars.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.ashstone_bars.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.dragonstone_bars.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.fyrite_bars.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.illumenite_bars.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.malachite_bars.get(), (layer) -> layer + == RenderType.cutout()); + } // end onFMLClientSetupEvent() @SubscribeEvent diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java b/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java index 9ee1d8a7..7b39cc81 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModBlocks.java @@ -8,8 +8,12 @@ import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceBlock; import mod.alexndr.simplecorelib.helpers.LightUtils; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.DoorBlock; +import net.minecraft.world.level.block.IronBarsBlock; import net.minecraft.world.level.block.OreBlock; +import net.minecraft.world.level.block.SlabBlock; import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.StairBlock; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; @@ -102,4 +106,91 @@ public final class ModBlocks .strength(3.5F, 12.0F) .lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)).requiresCorrectToolForDrops())); + // AESTHETICS STUFF + // Blocks - bricks - Netherrocks + public static RegistryObject argonite_bricks = BLOCKS.register("argonite_bricks", + () -> new Block(Block.Properties.copy(argonite_block.get()))); + public static RegistryObject ashstone_bricks = BLOCKS.register("ashstone_bricks", + () -> new Block(Block.Properties.copy(ashstone_block.get()))); + public static RegistryObject dragonstone_bricks = BLOCKS.register("dragonstone_bricks", + () -> new Block(Block.Properties.copy(dragonstone_block.get()))); + public static RegistryObject fyrite_bricks = BLOCKS.register("fyrite_bricks", + () -> new Block(Block.Properties.copy(fyrite_block.get()))); + public static RegistryObject illumenite_bricks = BLOCKS.register("illumenite_bricks", + () -> new Block(Block.Properties.copy(illumenite_block.get()) + .lightLevel(LightUtils.setFixedLight(15)))); + public static RegistryObject malachite_bricks = BLOCKS.register("malachite_bricks", + () -> new Block(Block.Properties.copy(malachite_block.get()))); + + // Blocks - slabs - netherrocks + public static RegistryObject argonite_brick_slab = BLOCKS.register("argonite_brick_slab", + () -> new SlabBlock(SlabBlock.Properties.copy(argonite_block.get()))); + public static RegistryObject ashstone_brick_slab = BLOCKS.register("ashstone_brick_slab", + () -> new SlabBlock(SlabBlock.Properties.copy(ashstone_block.get()))); + public static RegistryObject dragonstone_brick_slab = BLOCKS.register("dragonstone_brick_slab", + () -> new SlabBlock(SlabBlock.Properties.copy(dragonstone_block.get()))); + public static RegistryObject fyrite_brick_slab = BLOCKS.register("fyrite_brick_slab", + () -> new SlabBlock(SlabBlock.Properties.copy(fyrite_block.get()))); + public static RegistryObject illumenite_brick_slab = BLOCKS.register("illumenite_brick_slab", + () -> new SlabBlock(SlabBlock.Properties.copy(illumenite_block.get()) + .lightLevel(LightUtils.setFixedLight(15)))); + public static RegistryObject malachite_brick_slab = BLOCKS.register("malachite_brick_slab", + () -> new SlabBlock(SlabBlock.Properties.copy(malachite_block.get()))); + + // Blocks - stairs - netherrocks + public static RegistryObject argonite_brick_stairs = BLOCKS.register("argonite_brick_stairs", + () -> new StairBlock( () -> argonite_bricks.get().defaultBlockState(), + Block.Properties.copy(argonite_bricks.get()))); + public static RegistryObject ashstone_brick_stairs = BLOCKS.register("ashstone_brick_stairs", + () -> new StairBlock( () -> ashstone_bricks.get().defaultBlockState(), + Block.Properties.copy(ashstone_bricks.get()))); + public static RegistryObject dragonstone_brick_stairs = BLOCKS.register("dragonstone_brick_stairs", + () -> new StairBlock( () -> dragonstone_bricks.get().defaultBlockState(), + Block.Properties.copy(dragonstone_bricks.get()))); + public static RegistryObject fyrite_brick_stairs = BLOCKS.register("fyrite_brick_stairs", + () -> new StairBlock( () -> fyrite_bricks.get().defaultBlockState(), + Block.Properties.copy(fyrite_bricks.get()))); + public static RegistryObject illumenite_brick_stairs = BLOCKS.register("illumenite_brick_stairs", + () -> new StairBlock( () -> illumenite_bricks.get().defaultBlockState(), + Block.Properties.copy(illumenite_bricks.get()))); + public static RegistryObject malachite_brick_stairs = BLOCKS.register("malachite_brick_stairs", + () -> new StairBlock( () -> malachite_bricks.get().defaultBlockState(), + Block.Properties.copy(malachite_bricks.get()))); + + // Blocks - doors - netherrocks + public static RegistryObject argonite_door = BLOCKS.register("argonite_door", + () -> new DoorBlock(Block.Properties.copy(argonite_bricks.get()).noOcclusion())); + public static RegistryObject ashstone_door = BLOCKS.register("ashstone_door", + () -> new DoorBlock(Block.Properties.copy(ashstone_bricks.get()).noOcclusion())); + public static RegistryObject dragonstone_door = BLOCKS.register("dragonstone_door", + () -> new DoorBlock(Block.Properties.copy(dragonstone_bricks.get()).noOcclusion())); + public static RegistryObject fyrite_door = BLOCKS.register("fyrite_door", + () -> new DoorBlock(Block.Properties.copy(fyrite_bricks.get()).noOcclusion())); + public static RegistryObject illumenite_door = BLOCKS.register("illumenite_door", + () -> new DoorBlock(Block.Properties.copy(illumenite_bricks.get()).noOcclusion())); + public static RegistryObject malachite_door = BLOCKS.register("malachite_door", + () -> new DoorBlock(Block.Properties.copy(malachite_bricks.get()).noOcclusion())); + + // Blocks - bars - netherrocks + public static RegistryObject argonite_bars = BLOCKS.register("argonite_bars", + () -> new IronBarsBlock(Block.Properties.of(Material.METAL, MaterialColor.NONE) + .strength(7.0F).requiresCorrectToolForDrops().sound(SoundType.METAL).noOcclusion())); + public static RegistryObject ashstone_bars = BLOCKS.register("ashstone_bars", + () -> new IronBarsBlock(Block.Properties.of(Material.STONE, MaterialColor.NONE) + .strength(7.0F).requiresCorrectToolForDrops().sound(SoundType.STONE).noOcclusion())); + public static RegistryObject dragonstone_bars = BLOCKS.register("dragonstone_bars", + () -> new IronBarsBlock(Block.Properties.of(Material.STONE, MaterialColor.NONE) + .strength(10.0F).requiresCorrectToolForDrops().sound(SoundType.STONE).noOcclusion())); + public static RegistryObject fyrite_bars = BLOCKS.register("fyrite_bars", + () -> new IronBarsBlock(Block.Properties.of(Material.METAL, MaterialColor.NONE) + .strength(7.0F).requiresCorrectToolForDrops().sound(SoundType.METAL).noOcclusion())); + public static RegistryObject illumenite_bars = BLOCKS.register("illumenite_bars", + () -> new IronBarsBlock(Block.Properties.of(Material.METAL, MaterialColor.NONE) + .strength(7.0F).requiresCorrectToolForDrops().sound(SoundType.METAL).noOcclusion() + .lightLevel(LightUtils.setFixedLight(14)))); + public static RegistryObject malachite_bars = BLOCKS.register("malachite_bars", + () -> new IronBarsBlock(Block.Properties.of(Material.METAL, MaterialColor.NONE) + .strength(7.0F).requiresCorrectToolForDrops().sound(SoundType.METAL).noOcclusion())); + + } // end class ModBlocks From e87dbab6817629d11e71b07d2e473994d27a505f Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 4 Sep 2021 16:39:41 -0500 Subject: [PATCH 38/56] added enableAestheticBlocks to config; added mining tags for Aesthetics to datagen --- .../netherrocks/config/ConfigHelper.java | 2 + .../netherrocks/config/ServerConfig.java | 6 +- .../netherrocks/datagen/ModBlockTags.java | 69 ++++++++++++++++--- 3 files changed, 68 insertions(+), 9 deletions(-) diff --git a/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java b/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java index 0c86b0f1..11087ae7 100644 --- a/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java +++ b/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java @@ -55,6 +55,8 @@ public static void bakeServer(final ModConfig config) ConfigHolder.SERVER.serverMalachiteVeinSize.get(),ConfigHolder.SERVER.serverMalachiteVeinCount.get(), VerticalAnchor.absolute(ConfigHolder.SERVER.serverMalachiteBottomHeight.get()), VerticalAnchor.absolute(ConfigHolder.SERVER.serverMalachiteMaxHeight.get())); + + NetherrocksConfig.INSTANCE.putFlag("aesthetics_enabled", ConfigHolder.SERVER.serverEnableAesthetics.get()); } // end bakeServer() @SuppressWarnings("unused") diff --git a/src/main/java/mod/alexndr/netherrocks/config/ServerConfig.java b/src/main/java/mod/alexndr/netherrocks/config/ServerConfig.java index e1b10c3e..2ef1ddcf 100644 --- a/src/main/java/mod/alexndr/netherrocks/config/ServerConfig.java +++ b/src/main/java/mod/alexndr/netherrocks/config/ServerConfig.java @@ -50,13 +50,17 @@ final class ServerConfig final ForgeConfigSpec.IntValue serverMalachiteMaxHeight; final ForgeConfigSpec.BooleanValue serverAddModLootToChests; - + final ForgeConfigSpec.BooleanValue serverEnableAesthetics; + ServerConfig(final ForgeConfigSpec.Builder builder) { builder.push("General"); serverAddModLootToChests = builder.comment("Add Netherrocks items to chest loot?") .translation(Netherrocks.MODID + ".config.serverAddModLootToChests") .define("AddModLootToChests", true); + serverEnableAesthetics = builder.comment("Enable Netherrocks aesthetic blocks?") + .translation(Netherrocks.MODID + "config.EnableAesthetics") + .define("EnableAestheticsBlocks", true); builder.pop(); builder.push("OreGeneration"); diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java b/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java index 5790a58f..6c4575d7 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java @@ -24,9 +24,34 @@ protected void addTags() registerStorageBlockTags(); registerMiningTags(); registerBeaconTags(); - + registerDoorsSlabsAndStairs(); } + private void registerDoorsSlabsAndStairs() + { + this.tag(TagUtils.modBlockTag("minecraft", "doors")) + .add(ModBlocks.argonite_door.get()) + .add(ModBlocks.ashstone_door.get()) + .add(ModBlocks.dragonstone_door.get()) + .add(ModBlocks.fyrite_door.get()) + .add(ModBlocks.illumenite_door.get()) + .add(ModBlocks.malachite_door.get()); + this.tag(TagUtils.modBlockTag("minecraft","stairs")) + .add(ModBlocks.argonite_brick_stairs.get()) + .add(ModBlocks.ashstone_brick_stairs.get()) + .add(ModBlocks.dragonstone_brick_stairs.get()) + .add(ModBlocks.fyrite_brick_stairs.get()) + .add(ModBlocks.illumenite_brick_stairs.get()) + .add(ModBlocks.malachite_brick_stairs.get()); + this.tag(TagUtils.modBlockTag("minecraft","slabs")) + .add(ModBlocks.argonite_brick_slab.get()) + .add(ModBlocks.ashstone_brick_slab.get()) + .add(ModBlocks.dragonstone_brick_slab.get()) + .add(ModBlocks.fyrite_brick_slab.get()) + .add(ModBlocks.illumenite_brick_slab.get()) + .add(ModBlocks.malachite_brick_slab.get()); + } + private void registerStorageBlockTags() { this.tag(TagUtils.forgeBlockTag("storage_blocks")) @@ -69,19 +94,47 @@ private void registerMiningTags() { // do nothing; super() generates all the vanilla blocktags, and we don't want that. registerMineableTags( List.of(ModBlocks.argonite_block.get(), ModBlocks.argonite_ore.get(), - ModBlocks.ashstone_block.get(), ModBlocks.ashstone_ore.get(), ModBlocks.dragonstone_block.get(), - ModBlocks.dragonstone_ore.get(), ModBlocks.fyrite_block.get(), ModBlocks.illumenite_block.get(), - ModBlocks.illumenite_ore.get(), ModBlocks.malachite_block.get(), ModBlocks.malachite_ore.get(), + ModBlocks.argonite_bars.get(), ModBlocks.argonite_brick_slab.get(), ModBlocks.argonite_brick_stairs.get(), + ModBlocks.argonite_bricks.get(), ModBlocks.argonite_door.get(), + ModBlocks.ashstone_block.get(), ModBlocks.ashstone_ore.get(), + ModBlocks.ashstone_bars.get(), ModBlocks.ashstone_brick_slab.get(), ModBlocks.ashstone_brick_stairs.get(), + ModBlocks.ashstone_bricks.get(), ModBlocks.ashstone_door.get(), + ModBlocks.dragonstone_ore.get(), ModBlocks.dragonstone_block.get(), + ModBlocks.dragonstone_bars.get(), ModBlocks.dragonstone_brick_slab.get(), ModBlocks.dragonstone_brick_stairs.get(), + ModBlocks.dragonstone_bricks.get(), ModBlocks.dragonstone_door.get(), + ModBlocks.fyrite_block.get(), ModBlocks.fyrite_ore.get(), + ModBlocks.fyrite_bars.get(), ModBlocks.fyrite_brick_slab.get(), ModBlocks.fyrite_brick_stairs.get(), + ModBlocks.fyrite_bricks.get(), ModBlocks.fyrite_door.get(), + ModBlocks.illumenite_block.get(), ModBlocks.illumenite_ore.get(), + ModBlocks.illumenite_bars.get(), ModBlocks.illumenite_brick_slab.get(), ModBlocks.illumenite_brick_stairs.get(), + ModBlocks.illumenite_bricks.get(), ModBlocks.illumenite_door.get(), + ModBlocks.malachite_block.get(), ModBlocks.malachite_ore.get(), + ModBlocks.malachite_bars.get(), ModBlocks.malachite_brick_slab.get(), ModBlocks.malachite_brick_stairs.get(), + ModBlocks.malachite_bricks.get(), ModBlocks.malachite_door.get(), ModBlocks.raw_argonite_block.get(), ModBlocks.raw_fyrite_block.get(), ModBlocks.raw_illumenite_block.get(), ModBlocks.raw_malachite_block.get(), ModBlocks.nether_blast_furnace.get(), ModBlocks.nether_furnace.get(), ModBlocks.nether_smoker.get()), List.of(), // 1 - List.of(ModBlocks.fyrite_block.get(), ModBlocks.fyrite_ore.get(), ModBlocks.illumenite_block.get(), - ModBlocks.illumenite_ore.get(), ModBlocks.malachite_block.get(), ModBlocks.malachite_ore.get(), + List.of(ModBlocks.fyrite_block.get(), ModBlocks.fyrite_ore.get(), ModBlocks.fyrite_bars.get(), + ModBlocks.fyrite_brick_slab.get(), ModBlocks.fyrite_brick_stairs.get(), + ModBlocks.fyrite_bricks.get(), ModBlocks.fyrite_door.get(), + ModBlocks.illumenite_block.get(), ModBlocks.illumenite_ore.get(), ModBlocks.illumenite_bars.get(), + ModBlocks.illumenite_brick_slab.get(), ModBlocks.illumenite_brick_stairs.get(), + ModBlocks.illumenite_bricks.get(), ModBlocks.illumenite_door.get(), + ModBlocks.malachite_block.get(), ModBlocks.malachite_ore.get(), ModBlocks.malachite_bars.get(), + ModBlocks.malachite_brick_slab.get(), ModBlocks.malachite_brick_stairs.get(), + ModBlocks.malachite_bricks.get(), ModBlocks.malachite_door.get(), ModBlocks.raw_fyrite_block.get(), ModBlocks.raw_illumenite_block.get(), ModBlocks.raw_malachite_block.get()), // 2 - List.of(ModBlocks.argonite_block.get(), ModBlocks.argonite_ore.get(), ModBlocks.ashstone_block.get(), - ModBlocks.ashstone_ore.get(), ModBlocks.dragonstone_block.get(), ModBlocks.dragonstone_ore.get(), + List.of(ModBlocks.argonite_block.get(), ModBlocks.argonite_ore.get(), ModBlocks.argonite_bars.get(), + ModBlocks.argonite_brick_slab.get(), ModBlocks.argonite_brick_stairs.get(), + ModBlocks.argonite_bricks.get(), ModBlocks.argonite_door.get(), + ModBlocks.ashstone_block.get(), ModBlocks.ashstone_ore.get(), ModBlocks.ashstone_bars.get(), + ModBlocks.ashstone_brick_slab.get(), ModBlocks.ashstone_brick_stairs.get(), + ModBlocks.ashstone_bricks.get(), ModBlocks.ashstone_door.get(), + ModBlocks.dragonstone_block.get(), ModBlocks.dragonstone_ore.get(), ModBlocks.dragonstone_bars.get(), + ModBlocks.dragonstone_brick_slab.get(), ModBlocks.dragonstone_brick_stairs.get(), + ModBlocks.dragonstone_bricks.get(), ModBlocks.dragonstone_door.get(), ModBlocks.raw_argonite_block.get()), // 3 List.of()); // 4 } From ed79930c5ff61cb2c68a16032dee71c6b6a43859 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 4 Sep 2021 16:55:50 -0500 Subject: [PATCH 39/56] added item tags for aesthetics blocks; started adding recipes for aesthetics blocks --- .../netherrocks/datagen/ModItemTags.java | 27 +++++++++++++++++++ .../alexndr/netherrocks/datagen/Recipes.java | 11 ++++++++ 2 files changed, 38 insertions(+) diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java b/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java index 3a3ee5cf..8f82fa3f 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java @@ -1,6 +1,7 @@ package mod.alexndr.netherrocks.datagen; import mod.alexndr.netherrocks.Netherrocks; +import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.simplecorelib.helpers.TagUtils; import net.minecraft.data.DataGenerator; @@ -22,6 +23,32 @@ protected void addTags() registerDustTags(); registerOreChunkTags(); registerToolTags(); + registerDoorsSlabsAndStairs(); + } + + private void registerDoorsSlabsAndStairs() + { + this.tag(TagUtils.modTag("minecraft", "doors")) + .add(ModBlocks.argonite_door.get().asItem()) + .add(ModBlocks.ashstone_door.get().asItem()) + .add(ModBlocks.dragonstone_door.get().asItem()) + .add(ModBlocks.fyrite_door.get().asItem()) + .add(ModBlocks.illumenite_door.get().asItem()) + .add(ModBlocks.malachite_door.get().asItem()); + this.tag(TagUtils.modTag("minecraft","stairs")) + .add(ModBlocks.argonite_brick_stairs.get().asItem()) + .add(ModBlocks.ashstone_brick_stairs.get().asItem()) + .add(ModBlocks.dragonstone_brick_stairs.get().asItem()) + .add(ModBlocks.fyrite_brick_stairs.get().asItem()) + .add(ModBlocks.illumenite_brick_stairs.get().asItem()) + .add(ModBlocks.malachite_brick_stairs.get().asItem()); + this.tag(TagUtils.modTag("minecraft","slabs")) + .add(ModBlocks.argonite_brick_slab.get().asItem()) + .add(ModBlocks.ashstone_brick_slab.get().asItem()) + .add(ModBlocks.dragonstone_brick_slab.get().asItem()) + .add(ModBlocks.fyrite_brick_slab.get().asItem()) + .add(ModBlocks.illumenite_brick_slab.get().asItem()) + .add(ModBlocks.malachite_brick_slab.get().asItem()); } private void registerToolTags() diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java b/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java index 8a7f6b0f..131da3f7 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java @@ -32,8 +32,19 @@ protected void buildCraftingRecipes(Consumer consumer) // registerToolRecipes(consumer); // registerArmorRecipes(consumer); registerFurnaceRecipes(consumer); + registerAestheticRecipes(consumer); } // end registerRecipes() + + protected void registerAestheticRecipes(Consumer consumer) + { + setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.argonite_ingot.get()), "argonite", + has(ModItems.argonite_ingot.get()), flag("aesthetics_enabled")); + setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.ashstone_gem.get()), "ashstone", + has(ModItems.ashstone_gem.get()), flag("aesthetics_enabled")); + // TODO + } + protected void registerStorageRecipes(Consumer consumer) { setbuilder.buildSimpleStorageRecipes(consumer, ModItems.raw_fyrite.get(), From 73236fe9a72c414247f98d7c3cf3f3cb1f3d7ee8 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 4 Sep 2021 17:36:20 -0500 Subject: [PATCH 40/56] added loot drops for Netherrocks Aesthetics blocks; added Netherrocks Aesthetics items to valid fuels for nether furnace --- .../AbstractNetherFurnaceTileEntity.java | 8 +++++ .../datagen/NetherrocksLootTableProvider.java | 35 +++++++++++++++++++ .../alexndr/netherrocks/datagen/Recipes.java | 11 ++++-- .../tags/items/nether_furnace_fuels.json | 3 +- 4 files changed, 54 insertions(+), 3 deletions(-) diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java index 30b2e40c..d64364c6 100644 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java +++ b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java @@ -59,6 +59,10 @@ public static List getValidFuels() validFuels.add(ModItems.fyrite_ingot.get()); validFuels.add(ModItems.fyrite_nugget.get()); validFuels.add(ModItems.fyrite_dust.get()); + validFuels.add(ModBlocks.fyrite_bricks.get().asItem()); + validFuels.add(ModBlocks.fyrite_brick_stairs.get().asItem()); + validFuels.add(ModBlocks.fyrite_brick_slab.get().asItem()); + validFuels.add(ModBlocks.fyrite_door.get().asItem()); validFuels.add(Items.BLAZE_ROD); validFuels.add(Items.BLAZE_POWDER); for (Item item : ModTags.getnetherFurnaceFuels().getValues()) @@ -74,6 +78,10 @@ public static Map loadBurnTimes() Map map = Maps.newLinkedHashMap(); addItemBurnTime(map, Blocks.NETHERRACK, netherrackBurnTime); addItemBurnTime(map, ModBlocks.fyrite_block.get(), fyriteBurnTime * 10); + addItemBurnTime(map, ModBlocks.fyrite_bricks.get(), fyriteBurnTime * 10); + addItemBurnTime(map, ModBlocks.fyrite_brick_stairs.get(), fyriteBurnTime * 10); + addItemBurnTime(map, ModBlocks.fyrite_brick_slab.get(), fyriteBurnTime * 5); + addItemBurnTime(map, ModBlocks.fyrite_door.get(), fyriteBurnTime * 5); addItemBurnTime(map, ModItems.fyrite_ingot.get(), fyriteBurnTime); addItemBurnTime(map, ModItems.fyrite_nugget.get(), fyriteBurnTime/9); addItemBurnTime(map, ModItems.fyrite_dust.get(), fyriteBurnTime/2); diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java index 90d4ea2e..68a11e07 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java @@ -30,19 +30,54 @@ protected List>>, L tables.clear(); standardDropTable(ModBlocks.argonite_block.get()); standardDropTable(ModBlocks.raw_argonite_block.get()); + standardDropTable(ModBlocks.argonite_bricks.get()); + standardDropTable(ModBlocks.argonite_brick_stairs.get()); + standardDropTable(ModBlocks.argonite_brick_slab.get()); + standardDropTable(ModBlocks.argonite_bars.get()); + standardDropTable(ModBlocks.argonite_door.get()); specialDropTable(ModBlocks.argonite_ore.get(), ModItems.raw_argonite.get()); + standardDropTable(ModBlocks.ashstone_block.get()); + standardDropTable(ModBlocks.ashstone_bricks.get()); + standardDropTable(ModBlocks.ashstone_brick_stairs.get()); + standardDropTable(ModBlocks.ashstone_brick_slab.get()); + standardDropTable(ModBlocks.ashstone_bars.get()); + standardDropTable(ModBlocks.ashstone_door.get()); specialDropTable(ModBlocks.ashstone_ore.get(), ModItems.ashstone_gem.get()); + standardDropTable(ModBlocks.dragonstone_block.get()); + standardDropTable(ModBlocks.dragonstone_bricks.get()); + standardDropTable(ModBlocks.dragonstone_brick_stairs.get()); + standardDropTable(ModBlocks.dragonstone_brick_slab.get()); + standardDropTable(ModBlocks.dragonstone_bars.get()); + standardDropTable(ModBlocks.dragonstone_door.get()); specialDropTable(ModBlocks.dragonstone_ore.get(), ModItems.dragonstone_gem.get()); + standardDropTable(ModBlocks.fyrite_block.get()); standardDropTable(ModBlocks.raw_fyrite_block.get()); + standardDropTable(ModBlocks.fyrite_bricks.get()); + standardDropTable(ModBlocks.fyrite_brick_stairs.get()); + standardDropTable(ModBlocks.fyrite_brick_slab.get()); + standardDropTable(ModBlocks.fyrite_bars.get()); + standardDropTable(ModBlocks.fyrite_door.get()); specialDropTable(ModBlocks.fyrite_ore.get(), ModItems.raw_fyrite.get()); + standardDropTable(ModBlocks.illumenite_block.get()); standardDropTable(ModBlocks.raw_illumenite_block.get()); + standardDropTable(ModBlocks.illumenite_bricks.get()); + standardDropTable(ModBlocks.illumenite_brick_stairs.get()); + standardDropTable(ModBlocks.illumenite_brick_slab.get()); + standardDropTable(ModBlocks.illumenite_bars.get()); + standardDropTable(ModBlocks.illumenite_door.get()); specialDropTable(ModBlocks.illumenite_ore.get(), ModItems.raw_illumenite.get()); + standardDropTable(ModBlocks.malachite_block.get()); standardDropTable(ModBlocks.raw_malachite_block.get()); + standardDropTable(ModBlocks.malachite_bricks.get()); + standardDropTable(ModBlocks.malachite_brick_stairs.get()); + standardDropTable(ModBlocks.malachite_brick_slab.get()); + standardDropTable(ModBlocks.malachite_bars.get()); + standardDropTable(ModBlocks.malachite_door.get()); specialDropTable(ModBlocks.malachite_ore.get(), ModItems.raw_malachite.get()); copyNameDropTable(ModBlocks.nether_blast_furnace.get(), diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java b/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java index 131da3f7..0e4f2ffa 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java @@ -4,8 +4,8 @@ import mod.alexndr.netherrocks.Netherrocks; import mod.alexndr.netherrocks.config.NetherrocksConfig; -import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.netherrocks.init.ModBlocks; +import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.simplecorelib.datagen.ISimpleConditionBuilder; import mod.alexndr.simplecorelib.datagen.RecipeSetBuilder; import net.minecraft.data.DataGenerator; @@ -42,7 +42,14 @@ protected void registerAestheticRecipes(Consumer consumer) has(ModItems.argonite_ingot.get()), flag("aesthetics_enabled")); setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.ashstone_gem.get()), "ashstone", has(ModItems.ashstone_gem.get()), flag("aesthetics_enabled")); - // TODO + setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.dragonstone_gem.get()), "dragonstone", + has(ModItems.dragonstone_gem.get()), flag("aesthetics_enabled")); + setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.fyrite_ingot.get()), "fyrite", + has(ModItems.fyrite_ingot.get()), flag("aesthetics_enabled")); + setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.illumenite_ingot.get()), "illumenite", + has(ModItems.illumenite_ingot.get()), flag("aesthetics_enabled")); + setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.malachite_ingot.get()), "malachite", + has(ModItems.malachite_ingot.get()), flag("aesthetics_enabled")); } protected void registerStorageRecipes(Consumer consumer) diff --git a/src/main/resources/data/netherrocks/tags/items/nether_furnace_fuels.json b/src/main/resources/data/netherrocks/tags/items/nether_furnace_fuels.json index 26e6c4b4..ac32dacd 100644 --- a/src/main/resources/data/netherrocks/tags/items/nether_furnace_fuels.json +++ b/src/main/resources/data/netherrocks/tags/items/nether_furnace_fuels.json @@ -4,6 +4,7 @@ "netherrocks:fyrite_sword", "netherrocks:fyrite_axe", "netherrocks:fyrite_pickaxe", - "netherrocks:fyrite_shovel" + "netherrocks:fyrite_shovel", + "netherrocks:fyrite_bars" ] } From 28d5adba2c7508edb71151fed3daf03d642fffd4 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 4 Sep 2021 17:39:33 -0500 Subject: [PATCH 41/56] added blockstate and model generation for brick slabs --- scripts/generate_jsons.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scripts/generate_jsons.sh b/scripts/generate_jsons.sh index 8a2889fa..3c2b7b89 100755 --- a/scripts/generate_jsons.sh +++ b/scripts/generate_jsons.sh @@ -23,6 +23,12 @@ gen_blockstate_jsons.py --type=simple raw_fyrite_block gen_blockstate_jsons.py --type=simple raw_illumenite_block gen_blockstate_jsons.py --type=simple raw_argonite_block gen_blockstate_jsons.py --type=simple raw_malachite_block +gen_blockstate_jsons.py --type=slab argonite_brick_slab +gen_blockstate_jsons.py --type=slab ashstone_brick_slab +gen_blockstate_jsons.py --type=slab dragonstone_brick_slab +gen_blockstate_jsons.py --type=slab fyrite_brick_slab +gen_blockstate_jsons.py --type=slab illumenite_brick_slab +gen_blockstate_jsons.py --type=slab malachite_brick_slab # models TARGETDIR=${TOPDIR}/src/main/resources/assets/${ID}/models @@ -36,6 +42,12 @@ gen_model_jsons.py --type=block raw_fyrite_block gen_model_jsons.py --type=block raw_illumenite_block gen_model_jsons.py --type=block raw_argonite_block gen_model_jsons.py --type=block raw_malachite_block +gen_model_jsons.py --type=slab argonite_brick_slab +gen_model_jsons.py --type=slab ashstone_brick_slab +gen_model_jsons.py --type=slab dragonstone_brick_slab +gen_model_jsons.py --type=slab fyrite_brick_slab +gen_model_jsons.py --type=slab illumenite_brick_slab +gen_model_jsons.py --type=slab malachite_brick_slab #inventory items gen_model_jsons.py --type=inventory --item_only raw_fyrite From 31e183f7caeb57e9e44041bf71a99a93492dfcfa Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 4 Sep 2021 17:58:36 -0500 Subject: [PATCH 42/56] added generated resources for Netherrocks Aesthetics --- .../data/minecraft/tags/blocks/doors.json | 11 ++++++ .../tags/blocks/mineable/pickaxe.json | 33 +++++++++++++++- .../tags/blocks/needs_diamond_tool.json | 15 +++++++ .../tags/blocks/needs_iron_tool.json | 15 +++++++ .../data/minecraft/tags/blocks/slabs.json | 11 ++++++ .../data/minecraft/tags/blocks/stairs.json | 11 ++++++ .../data/minecraft/tags/items/doors.json | 11 ++++++ .../data/minecraft/tags/items/slabs.json | 11 ++++++ .../data/minecraft/tags/items/stairs.json | 11 ++++++ .../advancements/argonite_bars.json | 39 +++++++++++++++++++ .../advancements/argonite_brick_slab.json | 39 +++++++++++++++++++ .../advancements/argonite_brick_stairs.json | 39 +++++++++++++++++++ .../advancements/argonite_bricks.json | 39 +++++++++++++++++++ .../advancements/argonite_door.json | 39 +++++++++++++++++++ .../advancements/ashstone_bars.json | 39 +++++++++++++++++++ .../advancements/ashstone_brick_slab.json | 39 +++++++++++++++++++ .../advancements/ashstone_brick_stairs.json | 39 +++++++++++++++++++ .../advancements/ashstone_bricks.json | 39 +++++++++++++++++++ .../advancements/ashstone_door.json | 39 +++++++++++++++++++ .../advancements/dragonstone_bars.json | 39 +++++++++++++++++++ .../advancements/dragonstone_brick_slab.json | 39 +++++++++++++++++++ .../dragonstone_brick_stairs.json | 39 +++++++++++++++++++ .../advancements/dragonstone_bricks.json | 39 +++++++++++++++++++ .../advancements/dragonstone_door.json | 39 +++++++++++++++++++ .../netherrocks/advancements/fyrite_bars.json | 39 +++++++++++++++++++ .../advancements/fyrite_brick_slab.json | 39 +++++++++++++++++++ .../advancements/fyrite_brick_stairs.json | 39 +++++++++++++++++++ .../advancements/fyrite_bricks.json | 39 +++++++++++++++++++ .../netherrocks/advancements/fyrite_door.json | 39 +++++++++++++++++++ .../advancements/illumenite_bars.json | 39 +++++++++++++++++++ .../advancements/illumenite_brick_slab.json | 39 +++++++++++++++++++ .../advancements/illumenite_brick_stairs.json | 39 +++++++++++++++++++ .../advancements/illumenite_bricks.json | 39 +++++++++++++++++++ .../advancements/illumenite_door.json | 39 +++++++++++++++++++ .../advancements/malachite_bars.json | 39 +++++++++++++++++++ .../advancements/malachite_brick_slab.json | 39 +++++++++++++++++++ .../advancements/malachite_brick_stairs.json | 39 +++++++++++++++++++ .../advancements/malachite_bricks.json | 39 +++++++++++++++++++ .../advancements/malachite_door.json | 39 +++++++++++++++++++ .../loot_tables/blocks/argonite_bars.json | 21 ++++++++++ .../blocks/argonite_brick_slab.json | 21 ++++++++++ .../blocks/argonite_brick_stairs.json | 21 ++++++++++ .../loot_tables/blocks/argonite_bricks.json | 21 ++++++++++ .../loot_tables/blocks/argonite_door.json | 21 ++++++++++ .../loot_tables/blocks/ashstone_bars.json | 21 ++++++++++ .../blocks/ashstone_brick_slab.json | 21 ++++++++++ .../blocks/ashstone_brick_stairs.json | 21 ++++++++++ .../loot_tables/blocks/ashstone_bricks.json | 21 ++++++++++ .../loot_tables/blocks/ashstone_door.json | 21 ++++++++++ .../loot_tables/blocks/dragonstone_bars.json | 21 ++++++++++ .../blocks/dragonstone_brick_slab.json | 21 ++++++++++ .../blocks/dragonstone_brick_stairs.json | 21 ++++++++++ .../blocks/dragonstone_bricks.json | 21 ++++++++++ .../loot_tables/blocks/dragonstone_door.json | 21 ++++++++++ .../loot_tables/blocks/fyrite_bars.json | 21 ++++++++++ .../loot_tables/blocks/fyrite_brick_slab.json | 21 ++++++++++ .../blocks/fyrite_brick_stairs.json | 21 ++++++++++ .../loot_tables/blocks/fyrite_bricks.json | 21 ++++++++++ .../loot_tables/blocks/fyrite_door.json | 21 ++++++++++ .../loot_tables/blocks/illumenite_bars.json | 21 ++++++++++ .../blocks/illumenite_brick_slab.json | 21 ++++++++++ .../blocks/illumenite_brick_stairs.json | 21 ++++++++++ .../loot_tables/blocks/illumenite_bricks.json | 21 ++++++++++ .../loot_tables/blocks/illumenite_door.json | 21 ++++++++++ .../loot_tables/blocks/malachite_bars.json | 21 ++++++++++ .../blocks/malachite_brick_slab.json | 21 ++++++++++ .../blocks/malachite_brick_stairs.json | 21 ++++++++++ .../loot_tables/blocks/malachite_bricks.json | 21 ++++++++++ .../loot_tables/blocks/malachite_door.json | 21 ++++++++++ .../netherrocks/recipes/argonite_bars.json | 29 ++++++++++++++ .../recipes/argonite_brick_slab.json | 30 ++++++++++++++ .../argonite_brick_slab_stonecutting.json | 21 ++++++++++ .../recipes/argonite_brick_stairs.json | 30 ++++++++++++++ .../argonite_brick_stairs_stonecutting.json | 21 ++++++++++ .../netherrocks/recipes/argonite_bricks.json | 28 +++++++++++++ .../netherrocks/recipes/argonite_door.json | 30 ++++++++++++++ .../netherrocks/recipes/ashstone_bars.json | 29 ++++++++++++++ .../recipes/ashstone_brick_slab.json | 30 ++++++++++++++ .../ashstone_brick_slab_stonecutting.json | 21 ++++++++++ .../recipes/ashstone_brick_stairs.json | 30 ++++++++++++++ .../ashstone_brick_stairs_stonecutting.json | 21 ++++++++++ .../netherrocks/recipes/ashstone_bricks.json | 28 +++++++++++++ .../netherrocks/recipes/ashstone_door.json | 30 ++++++++++++++ .../netherrocks/recipes/dragonstone_bars.json | 29 ++++++++++++++ .../recipes/dragonstone_brick_slab.json | 30 ++++++++++++++ .../dragonstone_brick_slab_stonecutting.json | 21 ++++++++++ .../recipes/dragonstone_brick_stairs.json | 30 ++++++++++++++ ...dragonstone_brick_stairs_stonecutting.json | 21 ++++++++++ .../recipes/dragonstone_bricks.json | 28 +++++++++++++ .../netherrocks/recipes/dragonstone_door.json | 30 ++++++++++++++ .../data/netherrocks/recipes/fyrite_bars.json | 29 ++++++++++++++ .../recipes/fyrite_brick_slab.json | 30 ++++++++++++++ .../fyrite_brick_slab_stonecutting.json | 21 ++++++++++ .../recipes/fyrite_brick_stairs.json | 30 ++++++++++++++ .../fyrite_brick_stairs_stonecutting.json | 21 ++++++++++ .../netherrocks/recipes/fyrite_bricks.json | 28 +++++++++++++ .../data/netherrocks/recipes/fyrite_door.json | 30 ++++++++++++++ .../netherrocks/recipes/illumenite_bars.json | 29 ++++++++++++++ .../recipes/illumenite_brick_slab.json | 30 ++++++++++++++ .../illumenite_brick_slab_stonecutting.json | 21 ++++++++++ .../recipes/illumenite_brick_stairs.json | 30 ++++++++++++++ .../illumenite_brick_stairs_stonecutting.json | 21 ++++++++++ .../recipes/illumenite_bricks.json | 28 +++++++++++++ .../netherrocks/recipes/illumenite_door.json | 30 ++++++++++++++ .../netherrocks/recipes/malachite_bars.json | 29 ++++++++++++++ .../recipes/malachite_brick_slab.json | 30 ++++++++++++++ .../malachite_brick_slab_stonecutting.json | 21 ++++++++++ .../recipes/malachite_brick_stairs.json | 30 ++++++++++++++ .../malachite_brick_stairs_stonecutting.json | 21 ++++++++++ .../netherrocks/recipes/malachite_bricks.json | 28 +++++++++++++ .../netherrocks/recipes/malachite_door.json | 30 ++++++++++++++ .../blockstates/argonite_brick_slab.json | 13 +++++++ .../blockstates/ashstone_brick_slab.json | 13 +++++++ .../blockstates/dragonstone_brick_slab.json | 13 +++++++ .../blockstates/fyrite_brick_slab.json | 13 +++++++ .../blockstates/illumenite_brick_slab.json | 13 +++++++ .../blockstates/malachite_brick_slab.json | 13 +++++++ .../models/block/argonite_brick_slab.json | 8 ++++ .../models/block/argonite_brick_slab_top.json | 8 ++++ .../models/block/ashstone_brick_slab.json | 8 ++++ .../models/block/ashstone_brick_slab_top.json | 8 ++++ .../models/block/dragonstone_brick_slab.json | 8 ++++ .../block/dragonstone_brick_slab_top.json | 8 ++++ .../models/block/fyrite_brick_slab.json | 8 ++++ .../models/block/fyrite_brick_slab_top.json | 8 ++++ .../models/block/illumenite_brick_slab.json | 8 ++++ .../block/illumenite_brick_slab_top.json | 8 ++++ .../models/block/malachite_brick_slab.json | 8 ++++ .../block/malachite_brick_slab_top.json | 8 ++++ .../models/item/argonite_brick_slab.json | 3 ++ .../models/item/ashstone_brick_slab.json | 3 ++ .../models/item/dragonstone_brick_slab.json | 3 ++ .../models/item/fyrite_brick_slab.json | 3 ++ .../models/item/illumenite_brick_slab.json | 3 ++ .../models/item/malachite_brick_slab.json | 3 ++ 135 files changed, 3254 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/data/minecraft/tags/blocks/doors.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/slabs.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/stairs.json create mode 100644 src/generated/resources/data/minecraft/tags/items/doors.json create mode 100644 src/generated/resources/data/minecraft/tags/items/slabs.json create mode 100644 src/generated/resources/data/minecraft/tags/items/stairs.json create mode 100644 src/generated/resources/data/netherrocks/advancements/argonite_bars.json create mode 100644 src/generated/resources/data/netherrocks/advancements/argonite_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/advancements/argonite_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/advancements/argonite_bricks.json create mode 100644 src/generated/resources/data/netherrocks/advancements/argonite_door.json create mode 100644 src/generated/resources/data/netherrocks/advancements/ashstone_bars.json create mode 100644 src/generated/resources/data/netherrocks/advancements/ashstone_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/advancements/ashstone_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/advancements/ashstone_bricks.json create mode 100644 src/generated/resources/data/netherrocks/advancements/ashstone_door.json create mode 100644 src/generated/resources/data/netherrocks/advancements/dragonstone_bars.json create mode 100644 src/generated/resources/data/netherrocks/advancements/dragonstone_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/advancements/dragonstone_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/advancements/dragonstone_bricks.json create mode 100644 src/generated/resources/data/netherrocks/advancements/dragonstone_door.json create mode 100644 src/generated/resources/data/netherrocks/advancements/fyrite_bars.json create mode 100644 src/generated/resources/data/netherrocks/advancements/fyrite_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/advancements/fyrite_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/advancements/fyrite_bricks.json create mode 100644 src/generated/resources/data/netherrocks/advancements/fyrite_door.json create mode 100644 src/generated/resources/data/netherrocks/advancements/illumenite_bars.json create mode 100644 src/generated/resources/data/netherrocks/advancements/illumenite_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/advancements/illumenite_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/advancements/illumenite_bricks.json create mode 100644 src/generated/resources/data/netherrocks/advancements/illumenite_door.json create mode 100644 src/generated/resources/data/netherrocks/advancements/malachite_bars.json create mode 100644 src/generated/resources/data/netherrocks/advancements/malachite_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/advancements/malachite_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/advancements/malachite_bricks.json create mode 100644 src/generated/resources/data/netherrocks/advancements/malachite_door.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bars.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bricks.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_door.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bars.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bricks.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_door.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bars.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bricks.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_door.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bars.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bricks.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_door.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bars.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bricks.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_door.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bars.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bricks.json create mode 100644 src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_door.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_bars.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_brick_slab_stonecutting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_brick_stairs_stonecutting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_bricks.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_door.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_bars.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_brick_slab_stonecutting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_brick_stairs_stonecutting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_bricks.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_door.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_bars.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_brick_slab_stonecutting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_brick_stairs_stonecutting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_bricks.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_door.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_bars.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_brick_slab_stonecutting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_brick_stairs_stonecutting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_bricks.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_door.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_bars.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_brick_slab_stonecutting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_brick_stairs_stonecutting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_bricks.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_door.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_bars.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_brick_slab.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_brick_slab_stonecutting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_brick_stairs.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_brick_stairs_stonecutting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_bricks.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_door.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/argonite_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/ashstone_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/fyrite_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/illumenite_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/malachite_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_brick_slab_top.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_brick_slab_top.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_brick_slab_top.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_brick_slab_top.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_brick_slab_top.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_brick_slab_top.json create mode 100644 src/main/resources/assets/netherrocks/models/item/argonite_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/models/item/ashstone_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/models/item/dragonstone_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/models/item/fyrite_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/models/item/illumenite_brick_slab.json create mode 100644 src/main/resources/assets/netherrocks/models/item/malachite_brick_slab.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/doors.json b/src/generated/resources/data/minecraft/tags/blocks/doors.json new file mode 100644 index 00000000..9a780219 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/doors.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_door", + "netherrocks:ashstone_door", + "netherrocks:dragonstone_door", + "netherrocks:fyrite_door", + "netherrocks:illumenite_door", + "netherrocks:malachite_door" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 9fd48bb9..15a78ba9 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -3,15 +3,46 @@ "values": [ "netherrocks:argonite_block", "netherrocks:argonite_ore", + "netherrocks:argonite_bars", + "netherrocks:argonite_brick_slab", + "netherrocks:argonite_brick_stairs", + "netherrocks:argonite_bricks", + "netherrocks:argonite_door", "netherrocks:ashstone_block", "netherrocks:ashstone_ore", - "netherrocks:dragonstone_block", + "netherrocks:ashstone_bars", + "netherrocks:ashstone_brick_slab", + "netherrocks:ashstone_brick_stairs", + "netherrocks:ashstone_bricks", + "netherrocks:ashstone_door", "netherrocks:dragonstone_ore", + "netherrocks:dragonstone_block", + "netherrocks:dragonstone_bars", + "netherrocks:dragonstone_brick_slab", + "netherrocks:dragonstone_brick_stairs", + "netherrocks:dragonstone_bricks", + "netherrocks:dragonstone_door", "netherrocks:fyrite_block", + "netherrocks:fyrite_ore", + "netherrocks:fyrite_bars", + "netherrocks:fyrite_brick_slab", + "netherrocks:fyrite_brick_stairs", + "netherrocks:fyrite_bricks", + "netherrocks:fyrite_door", "netherrocks:illumenite_block", "netherrocks:illumenite_ore", + "netherrocks:illumenite_bars", + "netherrocks:illumenite_brick_slab", + "netherrocks:illumenite_brick_stairs", + "netherrocks:illumenite_bricks", + "netherrocks:illumenite_door", "netherrocks:malachite_block", "netherrocks:malachite_ore", + "netherrocks:malachite_bars", + "netherrocks:malachite_brick_slab", + "netherrocks:malachite_brick_stairs", + "netherrocks:malachite_bricks", + "netherrocks:malachite_door", "netherrocks:raw_argonite_block", "netherrocks:raw_fyrite_block", "netherrocks:raw_illumenite_block", diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json index b8f60dc3..e2a0dd50 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json @@ -3,10 +3,25 @@ "values": [ "netherrocks:argonite_block", "netherrocks:argonite_ore", + "netherrocks:argonite_bars", + "netherrocks:argonite_brick_slab", + "netherrocks:argonite_brick_stairs", + "netherrocks:argonite_bricks", + "netherrocks:argonite_door", "netherrocks:ashstone_block", "netherrocks:ashstone_ore", + "netherrocks:ashstone_bars", + "netherrocks:ashstone_brick_slab", + "netherrocks:ashstone_brick_stairs", + "netherrocks:ashstone_bricks", + "netherrocks:ashstone_door", "netherrocks:dragonstone_block", "netherrocks:dragonstone_ore", + "netherrocks:dragonstone_bars", + "netherrocks:dragonstone_brick_slab", + "netherrocks:dragonstone_brick_stairs", + "netherrocks:dragonstone_bricks", + "netherrocks:dragonstone_door", "netherrocks:raw_argonite_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json index df004614..84057069 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -3,10 +3,25 @@ "values": [ "netherrocks:fyrite_block", "netherrocks:fyrite_ore", + "netherrocks:fyrite_bars", + "netherrocks:fyrite_brick_slab", + "netherrocks:fyrite_brick_stairs", + "netherrocks:fyrite_bricks", + "netherrocks:fyrite_door", "netherrocks:illumenite_block", "netherrocks:illumenite_ore", + "netherrocks:illumenite_bars", + "netherrocks:illumenite_brick_slab", + "netherrocks:illumenite_brick_stairs", + "netherrocks:illumenite_bricks", + "netherrocks:illumenite_door", "netherrocks:malachite_block", "netherrocks:malachite_ore", + "netherrocks:malachite_bars", + "netherrocks:malachite_brick_slab", + "netherrocks:malachite_brick_stairs", + "netherrocks:malachite_bricks", + "netherrocks:malachite_door", "netherrocks:raw_fyrite_block", "netherrocks:raw_illumenite_block", "netherrocks:raw_malachite_block" diff --git a/src/generated/resources/data/minecraft/tags/blocks/slabs.json b/src/generated/resources/data/minecraft/tags/blocks/slabs.json new file mode 100644 index 00000000..c63a807a --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/slabs.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_brick_slab", + "netherrocks:ashstone_brick_slab", + "netherrocks:dragonstone_brick_slab", + "netherrocks:fyrite_brick_slab", + "netherrocks:illumenite_brick_slab", + "netherrocks:malachite_brick_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/stairs.json b/src/generated/resources/data/minecraft/tags/blocks/stairs.json new file mode 100644 index 00000000..efad8668 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/stairs.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_brick_stairs", + "netherrocks:ashstone_brick_stairs", + "netherrocks:dragonstone_brick_stairs", + "netherrocks:fyrite_brick_stairs", + "netherrocks:illumenite_brick_stairs", + "netherrocks:malachite_brick_stairs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/doors.json b/src/generated/resources/data/minecraft/tags/items/doors.json new file mode 100644 index 00000000..9a780219 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/doors.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_door", + "netherrocks:ashstone_door", + "netherrocks:dragonstone_door", + "netherrocks:fyrite_door", + "netherrocks:illumenite_door", + "netherrocks:malachite_door" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/slabs.json b/src/generated/resources/data/minecraft/tags/items/slabs.json new file mode 100644 index 00000000..c63a807a --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_brick_slab", + "netherrocks:ashstone_brick_slab", + "netherrocks:dragonstone_brick_slab", + "netherrocks:fyrite_brick_slab", + "netherrocks:illumenite_brick_slab", + "netherrocks:malachite_brick_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/stairs.json b/src/generated/resources/data/minecraft/tags/items/stairs.json new file mode 100644 index 00000000..efad8668 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_brick_stairs", + "netherrocks:ashstone_brick_stairs", + "netherrocks:dragonstone_brick_stairs", + "netherrocks:fyrite_brick_stairs", + "netherrocks:illumenite_brick_stairs", + "netherrocks:malachite_brick_stairs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/argonite_bars.json b/src/generated/resources/data/netherrocks/advancements/argonite_bars.json new file mode 100644 index 00000000..0ca9ed9e --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/argonite_bars.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_bars" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/argonite_brick_slab.json b/src/generated/resources/data/netherrocks/advancements/argonite_brick_slab.json new file mode 100644 index 00000000..aefd0bf8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/argonite_brick_slab.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_brick_slab" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/argonite_brick_stairs.json b/src/generated/resources/data/netherrocks/advancements/argonite_brick_stairs.json new file mode 100644 index 00000000..56204be5 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/argonite_brick_stairs.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_brick_stairs" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/argonite_bricks.json b/src/generated/resources/data/netherrocks/advancements/argonite_bricks.json new file mode 100644 index 00000000..0113e3c5 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/argonite_bricks.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_bricks" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/argonite_door.json b/src/generated/resources/data/netherrocks/advancements/argonite_door.json new file mode 100644 index 00000000..31a5cc29 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/argonite_door.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/ashstone_bars.json b/src/generated/resources/data/netherrocks/advancements/ashstone_bars.json new file mode 100644 index 00000000..e5164368 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/ashstone_bars.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_bars" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/ashstone_brick_slab.json b/src/generated/resources/data/netherrocks/advancements/ashstone_brick_slab.json new file mode 100644 index 00000000..56be1a08 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/ashstone_brick_slab.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_brick_slab" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/ashstone_brick_stairs.json b/src/generated/resources/data/netherrocks/advancements/ashstone_brick_stairs.json new file mode 100644 index 00000000..5e27ccde --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/ashstone_brick_stairs.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_brick_stairs" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/ashstone_bricks.json b/src/generated/resources/data/netherrocks/advancements/ashstone_bricks.json new file mode 100644 index 00000000..79e49581 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/ashstone_bricks.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_bricks" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/ashstone_door.json b/src/generated/resources/data/netherrocks/advancements/ashstone_door.json new file mode 100644 index 00000000..71e7cb19 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/ashstone_door.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/dragonstone_bars.json b/src/generated/resources/data/netherrocks/advancements/dragonstone_bars.json new file mode 100644 index 00000000..d2d8296c --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/dragonstone_bars.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_bars" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/dragonstone_brick_slab.json b/src/generated/resources/data/netherrocks/advancements/dragonstone_brick_slab.json new file mode 100644 index 00000000..9700e8bc --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/dragonstone_brick_slab.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_brick_slab" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/dragonstone_brick_stairs.json b/src/generated/resources/data/netherrocks/advancements/dragonstone_brick_stairs.json new file mode 100644 index 00000000..5f315894 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/dragonstone_brick_stairs.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_brick_stairs" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/dragonstone_bricks.json b/src/generated/resources/data/netherrocks/advancements/dragonstone_bricks.json new file mode 100644 index 00000000..5bb5ae45 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/dragonstone_bricks.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_bricks" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/dragonstone_door.json b/src/generated/resources/data/netherrocks/advancements/dragonstone_door.json new file mode 100644 index 00000000..bbc9c804 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/dragonstone_door.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/fyrite_bars.json b/src/generated/resources/data/netherrocks/advancements/fyrite_bars.json new file mode 100644 index 00000000..67d05919 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/fyrite_bars.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_bars" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/fyrite_brick_slab.json b/src/generated/resources/data/netherrocks/advancements/fyrite_brick_slab.json new file mode 100644 index 00000000..7d1cfc14 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/fyrite_brick_slab.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_brick_slab" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/fyrite_brick_stairs.json b/src/generated/resources/data/netherrocks/advancements/fyrite_brick_stairs.json new file mode 100644 index 00000000..984b5fc3 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/fyrite_brick_stairs.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_brick_stairs" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/fyrite_bricks.json b/src/generated/resources/data/netherrocks/advancements/fyrite_bricks.json new file mode 100644 index 00000000..709f450e --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/fyrite_bricks.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_bricks" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/fyrite_door.json b/src/generated/resources/data/netherrocks/advancements/fyrite_door.json new file mode 100644 index 00000000..f76b26dd --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/fyrite_door.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/illumenite_bars.json b/src/generated/resources/data/netherrocks/advancements/illumenite_bars.json new file mode 100644 index 00000000..d131db9b --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/illumenite_bars.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_bars" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/illumenite_brick_slab.json b/src/generated/resources/data/netherrocks/advancements/illumenite_brick_slab.json new file mode 100644 index 00000000..6580dbd4 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/illumenite_brick_slab.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_brick_slab" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/illumenite_brick_stairs.json b/src/generated/resources/data/netherrocks/advancements/illumenite_brick_stairs.json new file mode 100644 index 00000000..01332fbf --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/illumenite_brick_stairs.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_brick_stairs" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/illumenite_bricks.json b/src/generated/resources/data/netherrocks/advancements/illumenite_bricks.json new file mode 100644 index 00000000..e68450ad --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/illumenite_bricks.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_bricks" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/illumenite_door.json b/src/generated/resources/data/netherrocks/advancements/illumenite_door.json new file mode 100644 index 00000000..cd28167b --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/illumenite_door.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/malachite_bars.json b/src/generated/resources/data/netherrocks/advancements/malachite_bars.json new file mode 100644 index 00000000..0153f944 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/malachite_bars.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_bars" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/malachite_brick_slab.json b/src/generated/resources/data/netherrocks/advancements/malachite_brick_slab.json new file mode 100644 index 00000000..4219ae47 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/malachite_brick_slab.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_brick_slab" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/malachite_brick_stairs.json b/src/generated/resources/data/netherrocks/advancements/malachite_brick_stairs.json new file mode 100644 index 00000000..35f9794f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/malachite_brick_stairs.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_brick_stairs" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/malachite_bricks.json b/src/generated/resources/data/netherrocks/advancements/malachite_bricks.json new file mode 100644 index 00000000..8ebdbe0e --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/malachite_bricks.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_bricks" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/malachite_door.json b/src/generated/resources/data/netherrocks/advancements/malachite_door.json new file mode 100644 index 00000000..ed6920b3 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/malachite_door.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bars.json new file mode 100644 index 00000000..cfb8e299 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bars.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:argonite_bars" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_slab.json new file mode 100644 index 00000000..6d65a1ca --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_slab.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:argonite_brick_slab" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_stairs.json new file mode 100644 index 00000000..9c61daa2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_stairs.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:argonite_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bricks.json new file mode 100644 index 00000000..1baf6c6d --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bricks.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:argonite_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_door.json new file mode 100644 index 00000000..a0054359 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_door.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:argonite_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bars.json new file mode 100644 index 00000000..a2b50c8b --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bars.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:ashstone_bars" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_slab.json new file mode 100644 index 00000000..4f7eb954 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_slab.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:ashstone_brick_slab" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_stairs.json new file mode 100644 index 00000000..1106fdba --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_stairs.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:ashstone_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bricks.json new file mode 100644 index 00000000..d8c00dfc --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bricks.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:ashstone_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_door.json new file mode 100644 index 00000000..fba3c1a3 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_door.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:ashstone_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bars.json new file mode 100644 index 00000000..4a69a457 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bars.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:dragonstone_bars" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_slab.json new file mode 100644 index 00000000..4fe6c1bd --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_slab.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:dragonstone_brick_slab" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_stairs.json new file mode 100644 index 00000000..6dc588eb --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_stairs.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:dragonstone_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bricks.json new file mode 100644 index 00000000..8bbe10bb --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bricks.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:dragonstone_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_door.json new file mode 100644 index 00000000..1a34ca33 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_door.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:dragonstone_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bars.json new file mode 100644 index 00000000..a123a1bb --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bars.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:fyrite_bars" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_slab.json new file mode 100644 index 00000000..18abd4a4 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_slab.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:fyrite_brick_slab" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_stairs.json new file mode 100644 index 00000000..12d9eb4d --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_stairs.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:fyrite_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bricks.json new file mode 100644 index 00000000..a64ab06b --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bricks.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:fyrite_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_door.json new file mode 100644 index 00000000..b9f8f749 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_door.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:fyrite_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bars.json new file mode 100644 index 00000000..f099468b --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bars.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:illumenite_bars" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_slab.json new file mode 100644 index 00000000..7450fb79 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_slab.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:illumenite_brick_slab" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_stairs.json new file mode 100644 index 00000000..cf99480b --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_stairs.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:illumenite_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bricks.json new file mode 100644 index 00000000..d4fab093 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bricks.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:illumenite_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_door.json new file mode 100644 index 00000000..80e5e264 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_door.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:illumenite_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bars.json new file mode 100644 index 00000000..a91901c1 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bars.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:malachite_bars" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_slab.json new file mode 100644 index 00000000..1eea776e --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_slab.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:malachite_brick_slab" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_stairs.json new file mode 100644 index 00000000..f3fe16c7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_stairs.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:malachite_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bricks.json new file mode 100644 index 00000000..ff0f6377 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bricks.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:malachite_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_door.json new file mode 100644 index 00000000..6a0342e0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_door.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:malachite_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_bars.json b/src/generated/resources/data/netherrocks/recipes/argonite_bars.json new file mode 100644 index 00000000..786e4cf6 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_bars.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + } + }, + "result": { + "item": "netherrocks:argonite_bars", + "count": 16 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_brick_slab.json b/src/generated/resources/data/netherrocks/recipes/argonite_brick_slab.json new file mode 100644 index 00000000..bb2d7a68 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_brick_slab.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:argonite_bricks" + } + }, + "result": { + "item": "netherrocks:argonite_brick_slab", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_brick_slab_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/argonite_brick_slab_stonecutting.json new file mode 100644 index 00000000..d34fc0bd --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_brick_slab_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:argonite_bricks" + }, + "result": "netherrocks:argonite_brick_slab", + "count": 2 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_brick_stairs.json b/src/generated/resources/data/netherrocks/recipes/argonite_brick_stairs.json new file mode 100644 index 00000000..3fd76409 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_brick_stairs.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:argonite_bricks" + } + }, + "result": { + "item": "netherrocks:argonite_brick_stairs", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_brick_stairs_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/argonite_brick_stairs_stonecutting.json new file mode 100644 index 00000000..a6fd2064 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_brick_stairs_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:argonite_bricks" + }, + "result": "netherrocks:argonite_brick_stairs", + "count": 1 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_bricks.json b/src/generated/resources/data/netherrocks/recipes/argonite_bricks.json new file mode 100644 index 00000000..2126b6bc --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_bricks.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + } + }, + "result": { + "item": "netherrocks:argonite_bricks" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_door.json b/src/generated/resources/data/netherrocks/recipes/argonite_door.json new file mode 100644 index 00000000..a9e01243 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_door.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " SS", + " SS", + " SS" + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + } + }, + "result": { + "item": "netherrocks:argonite_door", + "count": 3 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_bars.json b/src/generated/resources/data/netherrocks/recipes/ashstone_bars.json new file mode 100644 index 00000000..2530f36c --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_bars.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + } + }, + "result": { + "item": "netherrocks:ashstone_bars", + "count": 16 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_brick_slab.json b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_slab.json new file mode 100644 index 00000000..2f3f847f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_slab.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:ashstone_bricks" + } + }, + "result": { + "item": "netherrocks:ashstone_brick_slab", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_brick_slab_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_slab_stonecutting.json new file mode 100644 index 00000000..f05ab768 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_slab_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:ashstone_bricks" + }, + "result": "netherrocks:ashstone_brick_slab", + "count": 2 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_brick_stairs.json b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_stairs.json new file mode 100644 index 00000000..c2ef11d0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_stairs.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:ashstone_bricks" + } + }, + "result": { + "item": "netherrocks:ashstone_brick_stairs", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_brick_stairs_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_stairs_stonecutting.json new file mode 100644 index 00000000..bebd2c47 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_stairs_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:ashstone_bricks" + }, + "result": "netherrocks:ashstone_brick_stairs", + "count": 1 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_bricks.json b/src/generated/resources/data/netherrocks/recipes/ashstone_bricks.json new file mode 100644 index 00000000..de2f37f0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_bricks.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + } + }, + "result": { + "item": "netherrocks:ashstone_bricks" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_door.json b/src/generated/resources/data/netherrocks/recipes/ashstone_door.json new file mode 100644 index 00000000..cc150e92 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_door.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " SS", + " SS", + " SS" + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + } + }, + "result": { + "item": "netherrocks:ashstone_door", + "count": 3 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_bars.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_bars.json new file mode 100644 index 00000000..111e6efc --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_bars.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_bars", + "count": 16 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_slab.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_slab.json new file mode 100644 index 00000000..201f3219 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_slab.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_bricks" + } + }, + "result": { + "item": "netherrocks:dragonstone_brick_slab", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_slab_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_slab_stonecutting.json new file mode 100644 index 00000000..a4f59fba --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_slab_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:dragonstone_bricks" + }, + "result": "netherrocks:dragonstone_brick_slab", + "count": 2 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_stairs.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_stairs.json new file mode 100644 index 00000000..fc6006e2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_stairs.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_bricks" + } + }, + "result": { + "item": "netherrocks:dragonstone_brick_stairs", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_stairs_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_stairs_stonecutting.json new file mode 100644 index 00000000..19abf44c --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_stairs_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:dragonstone_bricks" + }, + "result": "netherrocks:dragonstone_brick_stairs", + "count": 1 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_bricks.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_bricks.json new file mode 100644 index 00000000..507817b8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_bricks.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_bricks" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_door.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_door.json new file mode 100644 index 00000000..bff6eb1f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_door.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " SS", + " SS", + " SS" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_door", + "count": 3 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_bars.json b/src/generated/resources/data/netherrocks/recipes/fyrite_bars.json new file mode 100644 index 00000000..b1abb10b --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_bars.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_bars", + "count": 16 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_brick_slab.json b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_slab.json new file mode 100644 index 00000000..efb8e285 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_slab.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_bricks" + } + }, + "result": { + "item": "netherrocks:fyrite_brick_slab", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_brick_slab_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_slab_stonecutting.json new file mode 100644 index 00000000..32fd748c --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_slab_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:fyrite_bricks" + }, + "result": "netherrocks:fyrite_brick_slab", + "count": 2 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_brick_stairs.json b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_stairs.json new file mode 100644 index 00000000..a45e3e13 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_stairs.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_bricks" + } + }, + "result": { + "item": "netherrocks:fyrite_brick_stairs", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_brick_stairs_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_stairs_stonecutting.json new file mode 100644 index 00000000..762a55a0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_stairs_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:fyrite_bricks" + }, + "result": "netherrocks:fyrite_brick_stairs", + "count": 1 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_bricks.json b/src/generated/resources/data/netherrocks/recipes/fyrite_bricks.json new file mode 100644 index 00000000..e00600b6 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_bricks.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_bricks" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_door.json b/src/generated/resources/data/netherrocks/recipes/fyrite_door.json new file mode 100644 index 00000000..6083e519 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_door.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " SS", + " SS", + " SS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_door", + "count": 3 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_bars.json b/src/generated/resources/data/netherrocks/recipes/illumenite_bars.json new file mode 100644 index 00000000..702f3934 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_bars.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_bars", + "count": 16 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_brick_slab.json b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_slab.json new file mode 100644 index 00000000..6f9c9b4d --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_slab.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_bricks" + } + }, + "result": { + "item": "netherrocks:illumenite_brick_slab", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_brick_slab_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_slab_stonecutting.json new file mode 100644 index 00000000..31de90de --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_slab_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:illumenite_bricks" + }, + "result": "netherrocks:illumenite_brick_slab", + "count": 2 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_brick_stairs.json b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_stairs.json new file mode 100644 index 00000000..fa0ad5fb --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_stairs.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_bricks" + } + }, + "result": { + "item": "netherrocks:illumenite_brick_stairs", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_brick_stairs_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_stairs_stonecutting.json new file mode 100644 index 00000000..b4dea724 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_stairs_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:illumenite_bricks" + }, + "result": "netherrocks:illumenite_brick_stairs", + "count": 1 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_bricks.json b/src/generated/resources/data/netherrocks/recipes/illumenite_bricks.json new file mode 100644 index 00000000..422b972f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_bricks.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_bricks" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_door.json b/src/generated/resources/data/netherrocks/recipes/illumenite_door.json new file mode 100644 index 00000000..8a32eaf0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_door.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " SS", + " SS", + " SS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_door", + "count": 3 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_bars.json b/src/generated/resources/data/netherrocks/recipes/malachite_bars.json new file mode 100644 index 00000000..994f7fd2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_bars.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_bars", + "count": 16 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_brick_slab.json b/src/generated/resources/data/netherrocks/recipes/malachite_brick_slab.json new file mode 100644 index 00000000..49cc7b7b --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_brick_slab.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_bricks" + } + }, + "result": { + "item": "netherrocks:malachite_brick_slab", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_brick_slab_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/malachite_brick_slab_stonecutting.json new file mode 100644 index 00000000..4c56de8e --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_brick_slab_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:malachite_bricks" + }, + "result": "netherrocks:malachite_brick_slab", + "count": 2 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_brick_stairs.json b/src/generated/resources/data/netherrocks/recipes/malachite_brick_stairs.json new file mode 100644 index 00000000..08d0848d --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_brick_stairs.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_bricks" + } + }, + "result": { + "item": "netherrocks:malachite_brick_stairs", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_brick_stairs_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/malachite_brick_stairs_stonecutting.json new file mode 100644 index 00000000..07231c20 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_brick_stairs_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:malachite_bricks" + }, + "result": "netherrocks:malachite_brick_stairs", + "count": 1 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_bricks.json b/src/generated/resources/data/netherrocks/recipes/malachite_bricks.json new file mode 100644 index 00000000..35123d6a --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_bricks.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_bricks" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_door.json b/src/generated/resources/data/netherrocks/recipes/malachite_door.json new file mode 100644 index 00000000..e53aedd7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_door.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " SS", + " SS", + " SS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_door", + "count": 3 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/argonite_brick_slab.json new file mode 100644 index 00000000..adc11dcc --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "netherrocks:block/argonite_brick_slab" + }, + "type=double": { + "model": "netherrocks:block/argonite_brick_slab" + }, + "type=top": { + "model": "netherrocks:block/argonite_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_slab.json new file mode 100644 index 00000000..1cc108e8 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "netherrocks:block/ashstone_brick_slab" + }, + "type=double": { + "model": "netherrocks:block/ashstone_brick_slab" + }, + "type=top": { + "model": "netherrocks:block/ashstone_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_slab.json new file mode 100644 index 00000000..580f6c8d --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "netherrocks:block/dragonstone_brick_slab" + }, + "type=double": { + "model": "netherrocks:block/dragonstone_brick_slab" + }, + "type=top": { + "model": "netherrocks:block/dragonstone_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_slab.json new file mode 100644 index 00000000..35d37fa2 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "netherrocks:block/fyrite_brick_slab" + }, + "type=double": { + "model": "netherrocks:block/fyrite_brick_slab" + }, + "type=top": { + "model": "netherrocks:block/fyrite_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_slab.json new file mode 100644 index 00000000..62131f55 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "netherrocks:block/illumenite_brick_slab" + }, + "type=double": { + "model": "netherrocks:block/illumenite_brick_slab" + }, + "type=top": { + "model": "netherrocks:block/illumenite_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/malachite_brick_slab.json new file mode 100644 index 00000000..bbb4d109 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "netherrocks:block/malachite_brick_slab" + }, + "type=double": { + "model": "netherrocks:block/malachite_brick_slab" + }, + "type=top": { + "model": "netherrocks:block/malachite_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_brick_slab.json b/src/main/resources/assets/netherrocks/models/block/argonite_brick_slab.json new file mode 100644 index 00000000..fe2ca2e2 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "netherrocks:block/argonite_bricks", + "top": "netherrocks:block/argonite_bricks", + "side": "netherrocks:block/argonite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_brick_slab_top.json b/src/main/resources/assets/netherrocks/models/block/argonite_brick_slab_top.json new file mode 100644 index 00000000..e9aaadc0 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "netherrocks:block/argonite_bricks", + "top": "netherrocks:block/argonite_bricks", + "side": "netherrocks:block/argonite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_slab.json b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_slab.json new file mode 100644 index 00000000..ae49d432 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "netherrocks:block/ashstone_bricks", + "top": "netherrocks:block/ashstone_bricks", + "side": "netherrocks:block/ashstone_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_slab_top.json b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_slab_top.json new file mode 100644 index 00000000..31a14bec --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "netherrocks:block/ashstone_bricks", + "top": "netherrocks:block/ashstone_bricks", + "side": "netherrocks:block/ashstone_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_slab.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_slab.json new file mode 100644 index 00000000..084702f4 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "netherrocks:block/dragonstone_bricks", + "top": "netherrocks:block/dragonstone_bricks", + "side": "netherrocks:block/dragonstone_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_slab_top.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_slab_top.json new file mode 100644 index 00000000..a805f6d3 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "netherrocks:block/dragonstone_bricks", + "top": "netherrocks:block/dragonstone_bricks", + "side": "netherrocks:block/dragonstone_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_slab.json b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_slab.json new file mode 100644 index 00000000..cbb08244 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "netherrocks:block/fyrite_bricks", + "top": "netherrocks:block/fyrite_bricks", + "side": "netherrocks:block/fyrite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_slab_top.json b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_slab_top.json new file mode 100644 index 00000000..7ae2f2fd --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "netherrocks:block/fyrite_bricks", + "top": "netherrocks:block/fyrite_bricks", + "side": "netherrocks:block/fyrite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_slab.json b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_slab.json new file mode 100644 index 00000000..b43021d7 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "netherrocks:block/illumenite_bricks", + "top": "netherrocks:block/illumenite_bricks", + "side": "netherrocks:block/illumenite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_slab_top.json b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_slab_top.json new file mode 100644 index 00000000..6505de4f --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "netherrocks:block/illumenite_bricks", + "top": "netherrocks:block/illumenite_bricks", + "side": "netherrocks:block/illumenite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_brick_slab.json b/src/main/resources/assets/netherrocks/models/block/malachite_brick_slab.json new file mode 100644 index 00000000..ebe28bcb --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "netherrocks:block/malachite_bricks", + "top": "netherrocks:block/malachite_bricks", + "side": "netherrocks:block/malachite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_brick_slab_top.json b/src/main/resources/assets/netherrocks/models/block/malachite_brick_slab_top.json new file mode 100644 index 00000000..11928e6c --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "netherrocks:block/malachite_bricks", + "top": "netherrocks:block/malachite_bricks", + "side": "netherrocks:block/malachite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/argonite_brick_slab.json b/src/main/resources/assets/netherrocks/models/item/argonite_brick_slab.json new file mode 100644 index 00000000..207e30ce --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/argonite_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/argonite_brick_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/ashstone_brick_slab.json b/src/main/resources/assets/netherrocks/models/item/ashstone_brick_slab.json new file mode 100644 index 00000000..9dcfbda2 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/ashstone_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/ashstone_brick_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_slab.json b/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_slab.json new file mode 100644 index 00000000..bcc76e28 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/dragonstone_brick_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/fyrite_brick_slab.json b/src/main/resources/assets/netherrocks/models/item/fyrite_brick_slab.json new file mode 100644 index 00000000..489a4442 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/fyrite_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/fyrite_brick_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/illumenite_brick_slab.json b/src/main/resources/assets/netherrocks/models/item/illumenite_brick_slab.json new file mode 100644 index 00000000..7638c5c7 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/illumenite_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/illumenite_brick_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/malachite_brick_slab.json b/src/main/resources/assets/netherrocks/models/item/malachite_brick_slab.json new file mode 100644 index 00000000..30b7a9a0 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/malachite_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/malachite_brick_slab" +} \ No newline at end of file From b8fa643ac892247621ae203d86d7e014f9a531ae Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 4 Sep 2021 18:58:55 -0500 Subject: [PATCH 43/56] movedNetherrock Aesthetics assets from Aesthetics mod --- .../blockstates/argonite_bars.json | 32 +++++++++++++ .../blockstates/argonite_brick_stairs.json | 44 ++++++++++++++++++ .../blockstates/argonite_bricks.json | 5 ++ .../blockstates/argonite_door.json | 36 ++++++++++++++ .../blockstates/ashstone_bars.json | 32 +++++++++++++ .../blockstates/ashstone_brick_stairs.json | 44 ++++++++++++++++++ .../blockstates/ashstone_bricks.json | 5 ++ .../blockstates/ashstone_door.json | 36 ++++++++++++++ .../blockstates/dragonstone_bars.json | 32 +++++++++++++ .../blockstates/dragonstone_brick_stairs.json | 44 ++++++++++++++++++ .../blockstates/dragonstone_bricks.json | 5 ++ .../blockstates/dragonstone_door.json | 36 ++++++++++++++ .../netherrocks/blockstates/fyrite_bars.json | 32 +++++++++++++ .../blockstates/fyrite_brick_stairs.json | 44 ++++++++++++++++++ .../blockstates/fyrite_bricks.json | 5 ++ .../netherrocks/blockstates/fyrite_door.json | 36 ++++++++++++++ .../blockstates/illumenite_bars.json | 32 +++++++++++++ .../blockstates/illumenite_brick_stairs.json | 44 ++++++++++++++++++ .../blockstates/illumenite_bricks.json | 5 ++ .../blockstates/illumenite_door.json | 36 ++++++++++++++ .../blockstates/malachite_bars.json | 32 +++++++++++++ .../blockstates/malachite_brick_stairs.json | 44 ++++++++++++++++++ .../blockstates/malachite_bricks.json | 5 ++ .../blockstates/malachite_door.json | 36 ++++++++++++++ .../assets/netherrocks/lang/en_us.json | 28 +++++++++++ .../assets/netherrocks/lang/fr_fr.json | 29 +++++++++++- .../models/block/argonite_bars_cap.json | 24 ++++++++++ .../models/block/argonite_bars_cap_alt.json | 24 ++++++++++ .../models/block/argonite_bars_post.json | 23 +++++++++ .../models/block/argonite_bars_post_ends.json | 23 +++++++++ .../models/block/argonite_bars_side.json | 37 +++++++++++++++ .../models/block/argonite_bars_side_alt.json | 39 ++++++++++++++++ .../block/argonite_brick_inner_stairs.json | 8 ++++ .../block/argonite_brick_outer_stairs.json | 8 ++++ .../models/block/argonite_brick_stairs.json | 8 ++++ .../models/block/argonite_bricks.json | 6 +++ .../models/block/argonite_door_bottom.json | 7 +++ .../models/block/argonite_door_bottom_rh.json | 7 +++ .../models/block/argonite_door_top.json | 7 +++ .../models/block/argonite_door_top_rh.json | 7 +++ .../models/block/ashstone_bars_cap.json | 24 ++++++++++ .../models/block/ashstone_bars_cap_alt.json | 24 ++++++++++ .../models/block/ashstone_bars_post.json | 23 +++++++++ .../models/block/ashstone_bars_post_ends.json | 23 +++++++++ .../models/block/ashstone_bars_side.json | 37 +++++++++++++++ .../models/block/ashstone_bars_side_alt.json | 39 ++++++++++++++++ .../block/ashstone_brick_inner_stairs.json | 8 ++++ .../block/ashstone_brick_outer_stairs.json | 8 ++++ .../models/block/ashstone_brick_stairs.json | 8 ++++ .../models/block/ashstone_bricks.json | 6 +++ .../models/block/ashstone_door_bottom.json | 7 +++ .../models/block/ashstone_door_bottom_rh.json | 7 +++ .../models/block/ashstone_door_top.json | 7 +++ .../models/block/ashstone_door_top_rh.json | 7 +++ .../models/block/dragonstone_bars_cap.json | 24 ++++++++++ .../block/dragonstone_bars_cap_alt.json | 24 ++++++++++ .../models/block/dragonstone_bars_post.json | 23 +++++++++ .../block/dragonstone_bars_post_ends.json | 23 +++++++++ .../models/block/dragonstone_bars_side.json | 37 +++++++++++++++ .../block/dragonstone_bars_side_alt.json | 39 ++++++++++++++++ .../block/dragonstone_brick_inner_stairs.json | 8 ++++ .../block/dragonstone_brick_outer_stairs.json | 8 ++++ .../block/dragonstone_brick_stairs.json | 8 ++++ .../models/block/dragonstone_bricks.json | 6 +++ .../models/block/dragonstone_door_bottom.json | 7 +++ .../block/dragonstone_door_bottom_rh.json | 7 +++ .../models/block/dragonstone_door_top.json | 7 +++ .../models/block/dragonstone_door_top_rh.json | 7 +++ .../models/block/fyrite_bars_cap.json | 24 ++++++++++ .../models/block/fyrite_bars_cap_alt.json | 24 ++++++++++ .../models/block/fyrite_bars_post.json | 23 +++++++++ .../models/block/fyrite_bars_post_ends.json | 23 +++++++++ .../models/block/fyrite_bars_side.json | 37 +++++++++++++++ .../models/block/fyrite_bars_side_alt.json | 39 ++++++++++++++++ .../block/fyrite_brick_inner_stairs.json | 8 ++++ .../block/fyrite_brick_outer_stairs.json | 8 ++++ .../models/block/fyrite_brick_stairs.json | 8 ++++ .../models/block/fyrite_bricks.json | 6 +++ .../models/block/fyrite_door_bottom.json | 7 +++ .../models/block/fyrite_door_bottom_rh.json | 7 +++ .../models/block/fyrite_door_top.json | 7 +++ .../models/block/fyrite_door_top_rh.json | 7 +++ .../models/block/illumenite_bars_cap.json | 24 ++++++++++ .../models/block/illumenite_bars_cap_alt.json | 24 ++++++++++ .../models/block/illumenite_bars_post.json | 23 +++++++++ .../block/illumenite_bars_post_ends.json | 23 +++++++++ .../models/block/illumenite_bars_side.json | 37 +++++++++++++++ .../block/illumenite_bars_side_alt.json | 39 ++++++++++++++++ .../block/illumenite_brick_inner_stairs.json | 8 ++++ .../block/illumenite_brick_outer_stairs.json | 8 ++++ .../models/block/illumenite_brick_stairs.json | 8 ++++ .../models/block/illumenite_bricks.json | 6 +++ .../models/block/illumenite_door_bottom.json | 7 +++ .../block/illumenite_door_bottom_rh.json | 7 +++ .../models/block/illumenite_door_top.json | 7 +++ .../models/block/illumenite_door_top_rh.json | 7 +++ .../models/block/malachite_bars_cap.json | 24 ++++++++++ .../models/block/malachite_bars_cap_alt.json | 24 ++++++++++ .../models/block/malachite_bars_post.json | 23 +++++++++ .../block/malachite_bars_post_ends.json | 23 +++++++++ .../models/block/malachite_bars_side.json | 37 +++++++++++++++ .../models/block/malachite_bars_side_alt.json | 39 ++++++++++++++++ .../block/malachite_brick_inner_stairs.json | 8 ++++ .../block/malachite_brick_outer_stairs.json | 8 ++++ .../models/block/malachite_brick_stairs.json | 8 ++++ .../models/block/malachite_bricks.json | 6 +++ .../models/block/malachite_door_bottom.json | 7 +++ .../block/malachite_door_bottom_rh.json | 7 +++ .../models/block/malachite_door_top.json | 7 +++ .../models/block/malachite_door_top_rh.json | 7 +++ .../models/item/argonite_bars.json | 6 +++ .../models/item/argonite_brick_stairs.json | 3 ++ .../models/item/argonite_bricks.json | 3 ++ .../models/item/argonite_door.json | 6 +++ .../models/item/ashstone_bars.json | 6 +++ .../models/item/ashstone_brick_stairs.json | 3 ++ .../models/item/ashstone_bricks.json | 3 ++ .../models/item/ashstone_door.json | 6 +++ .../models/item/dragonstone_bars.json | 6 +++ .../models/item/dragonstone_brick_stairs.json | 3 ++ .../models/item/dragonstone_bricks.json | 3 ++ .../models/item/dragonstone_door.json | 6 +++ .../netherrocks/models/item/fyrite_bars.json | 6 +++ .../models/item/fyrite_brick_stairs.json | 3 ++ .../models/item/fyrite_bricks.json | 3 ++ .../netherrocks/models/item/fyrite_door.json | 6 +++ .../models/item/illumenite_bars.json | 6 +++ .../models/item/illumenite_brick_stairs.json | 3 ++ .../models/item/illumenite_bricks.json | 3 ++ .../models/item/illumenite_door.json | 6 +++ .../models/item/malachite_bars.json | 6 +++ .../models/item/malachite_brick_stairs.json | 3 ++ .../models/item/malachite_bricks.json | 3 ++ .../models/item/malachite_door.json | 6 +++ .../textures/block/argonite_bars.png | Bin 0 -> 530 bytes .../textures/block/argonite_bricks.png | Bin 0 -> 223 bytes .../textures/block/argonite_door_lower.png | Bin 0 -> 608 bytes .../textures/block/argonite_door_upper.png | Bin 0 -> 575 bytes .../textures/block/ashstone_bars.png | Bin 0 -> 484 bytes .../textures/block/ashstone_bricks.png | Bin 0 -> 219 bytes .../textures/block/ashstone_door_lower.png | Bin 0 -> 554 bytes .../textures/block/ashstone_door_upper.png | Bin 0 -> 546 bytes .../textures/block/dragonstone_bars.png | Bin 0 -> 499 bytes .../textures/block/dragonstone_bricks.png | Bin 0 -> 230 bytes .../textures/block/dragonstone_door_lower.png | Bin 0 -> 611 bytes .../textures/block/dragonstone_door_upper.png | Bin 0 -> 574 bytes .../textures/block/fyrite_bars.png | Bin 0 -> 521 bytes .../textures/block/fyrite_bricks.png | Bin 0 -> 232 bytes .../textures/block/fyrite_door_lower.png | Bin 0 -> 629 bytes .../textures/block/fyrite_door_upper.png | Bin 0 -> 575 bytes .../textures/block/illumenite_bars.png | Bin 0 -> 492 bytes .../textures/block/illumenite_bricks.png | Bin 0 -> 224 bytes .../textures/block/illumenite_door_lower.png | Bin 0 -> 566 bytes .../textures/block/illumenite_door_upper.png | Bin 0 -> 493 bytes .../textures/block/malachite_bars.png | Bin 0 -> 556 bytes .../textures/block/malachite_bricks.png | Bin 0 -> 224 bytes .../textures/block/malachite_door_lower.png | Bin 0 -> 665 bytes .../textures/block/malachite_door_upper.png | Bin 0 -> 592 bytes .../textures/item/argonite_door.png | Bin 0 -> 1166 bytes .../textures/item/ashstone_door.png | Bin 0 -> 1166 bytes .../textures/item/dragonstone_door.png | Bin 0 -> 216 bytes .../netherrocks/textures/item/fyrite_door.png | Bin 0 -> 1166 bytes .../textures/item/illumenite_door.png | Bin 0 -> 1166 bytes .../textures/item/malachite_door.png | Bin 0 -> 234 bytes 164 files changed, 2234 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/netherrocks/blockstates/argonite_bars.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/argonite_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/argonite_bricks.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/argonite_door.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/ashstone_bars.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/ashstone_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/ashstone_bricks.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/ashstone_door.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/dragonstone_bars.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/dragonstone_bricks.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/dragonstone_door.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/fyrite_bars.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/fyrite_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/fyrite_bricks.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/fyrite_door.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/illumenite_bars.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/illumenite_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/illumenite_bricks.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/illumenite_door.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/malachite_bars.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/malachite_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/malachite_bricks.json create mode 100644 src/main/resources/assets/netherrocks/blockstates/malachite_door.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_bars_cap.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_bars_cap_alt.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_bars_post.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_bars_post_ends.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_bars_side.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_bars_side_alt.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_brick_inner_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_brick_outer_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_bricks.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_door_bottom.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_door_bottom_rh.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_door_top.json create mode 100644 src/main/resources/assets/netherrocks/models/block/argonite_door_top_rh.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap_alt.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_bars_post.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_bars_post_ends.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_bars_side.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_bars_side_alt.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_brick_inner_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_brick_outer_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_bricks.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom_rh.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_door_top.json create mode 100644 src/main/resources/assets/netherrocks/models/block/ashstone_door_top_rh.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap_alt.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post_ends.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side_alt.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_brick_inner_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_brick_outer_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_bricks.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom_rh.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_door_top.json create mode 100644 src/main/resources/assets/netherrocks/models/block/dragonstone_door_top_rh.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap_alt.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_bars_post.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_bars_post_ends.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_bars_side.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_bars_side_alt.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_brick_inner_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_brick_outer_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_bricks.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom_rh.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_door_top.json create mode 100644 src/main/resources/assets/netherrocks/models/block/fyrite_door_top_rh.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap_alt.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_bars_post.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_bars_post_ends.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_bars_side.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_bars_side_alt.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_brick_inner_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_brick_outer_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_bricks.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom_rh.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_door_top.json create mode 100644 src/main/resources/assets/netherrocks/models/block/illumenite_door_top_rh.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_bars_cap.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_bars_cap_alt.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_bars_post.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_bars_post_ends.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_bars_side.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_bars_side_alt.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_brick_inner_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_brick_outer_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_bricks.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_door_bottom.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_door_bottom_rh.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_door_top.json create mode 100644 src/main/resources/assets/netherrocks/models/block/malachite_door_top_rh.json create mode 100644 src/main/resources/assets/netherrocks/models/item/argonite_bars.json create mode 100644 src/main/resources/assets/netherrocks/models/item/argonite_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/item/argonite_bricks.json create mode 100644 src/main/resources/assets/netherrocks/models/item/argonite_door.json create mode 100644 src/main/resources/assets/netherrocks/models/item/ashstone_bars.json create mode 100644 src/main/resources/assets/netherrocks/models/item/ashstone_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/item/ashstone_bricks.json create mode 100644 src/main/resources/assets/netherrocks/models/item/ashstone_door.json create mode 100644 src/main/resources/assets/netherrocks/models/item/dragonstone_bars.json create mode 100644 src/main/resources/assets/netherrocks/models/item/dragonstone_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/item/dragonstone_bricks.json create mode 100644 src/main/resources/assets/netherrocks/models/item/dragonstone_door.json create mode 100644 src/main/resources/assets/netherrocks/models/item/fyrite_bars.json create mode 100644 src/main/resources/assets/netherrocks/models/item/fyrite_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/item/fyrite_bricks.json create mode 100644 src/main/resources/assets/netherrocks/models/item/fyrite_door.json create mode 100644 src/main/resources/assets/netherrocks/models/item/illumenite_bars.json create mode 100644 src/main/resources/assets/netherrocks/models/item/illumenite_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/item/illumenite_bricks.json create mode 100644 src/main/resources/assets/netherrocks/models/item/illumenite_door.json create mode 100644 src/main/resources/assets/netherrocks/models/item/malachite_bars.json create mode 100644 src/main/resources/assets/netherrocks/models/item/malachite_brick_stairs.json create mode 100644 src/main/resources/assets/netherrocks/models/item/malachite_bricks.json create mode 100644 src/main/resources/assets/netherrocks/models/item/malachite_door.json create mode 100644 src/main/resources/assets/netherrocks/textures/block/argonite_bars.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/argonite_bricks.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/argonite_door_lower.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/argonite_door_upper.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/ashstone_bars.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/ashstone_bricks.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/ashstone_door_lower.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/ashstone_door_upper.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/dragonstone_bars.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/dragonstone_bricks.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/dragonstone_door_lower.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/dragonstone_door_upper.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/fyrite_bars.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/fyrite_bricks.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/fyrite_door_lower.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/fyrite_door_upper.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/illumenite_bars.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/illumenite_bricks.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/illumenite_door_lower.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/illumenite_door_upper.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/malachite_bars.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/malachite_bricks.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/malachite_door_lower.png create mode 100644 src/main/resources/assets/netherrocks/textures/block/malachite_door_upper.png create mode 100644 src/main/resources/assets/netherrocks/textures/item/argonite_door.png create mode 100644 src/main/resources/assets/netherrocks/textures/item/ashstone_door.png create mode 100644 src/main/resources/assets/netherrocks/textures/item/dragonstone_door.png create mode 100644 src/main/resources/assets/netherrocks/textures/item/fyrite_door.png create mode 100644 src/main/resources/assets/netherrocks/textures/item/illumenite_door.png create mode 100644 src/main/resources/assets/netherrocks/textures/item/malachite_door.png diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_bars.json b/src/main/resources/assets/netherrocks/blockstates/argonite_bars.json new file mode 100644 index 00000000..b449e12e --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_bars.json @@ -0,0 +1,32 @@ +{ + "multipart": [ + { "apply": { "model": "aesthetics:block/argonite_bars_post_ends" }}, + { "when": { "north": false, "east": false, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/argonite_bars_post" } + }, + { "when": { "north": true, "east": false, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/argonite_bars_cap" } + }, + { "when": { "north": false, "east": true, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/argonite_bars_cap", "y": 90 } + }, + { "when": { "north": false, "east": false, "south": true, "west": false }, + "apply": { "model": "aesthetics:block/argonite_bars_cap_alt" } + }, + { "when": { "north": false, "east": false, "south": false, "west": true }, + "apply": { "model": "aesthetics:block/argonite_bars_cap_alt", "y": 90 } + }, + { "when": { "north": true }, + "apply": { "model": "aesthetics:block/argonite_bars_side" } + }, + { "when": { "east": true }, + "apply": { "model": "aesthetics:block/argonite_bars_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "aesthetics:block/argonite_bars_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "aesthetics:block/argonite_bars_side_alt", "y": 90 } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/argonite_brick_stairs.json new file mode 100644 index 00000000..514e35b5 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_brick_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_bricks.json b/src/main/resources/assets/netherrocks/blockstates/argonite_bricks.json new file mode 100644 index 00000000..1ca72e1c --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "aesthetics:block/argonite_bricks" } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_door.json b/src/main/resources/assets/netherrocks/blockstates/argonite_door.json new file mode 100644 index 00000000..35dd95a0 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_door.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_bars.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_bars.json new file mode 100644 index 00000000..a965fac5 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_bars.json @@ -0,0 +1,32 @@ +{ + "multipart": [ + { "apply": { "model": "aesthetics:block/ashstone_bars_post_ends" }}, + { "when": { "north": false, "east": false, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/ashstone_bars_post" } + }, + { "when": { "north": true, "east": false, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/ashstone_bars_cap" } + }, + { "when": { "north": false, "east": true, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/ashstone_bars_cap", "y": 90 } + }, + { "when": { "north": false, "east": false, "south": true, "west": false }, + "apply": { "model": "aesthetics:block/ashstone_bars_cap_alt" } + }, + { "when": { "north": false, "east": false, "south": false, "west": true }, + "apply": { "model": "aesthetics:block/ashstone_bars_cap_alt", "y": 90 } + }, + { "when": { "north": true }, + "apply": { "model": "aesthetics:block/ashstone_bars_side" } + }, + { "when": { "east": true }, + "apply": { "model": "aesthetics:block/ashstone_bars_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "aesthetics:block/ashstone_bars_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "aesthetics:block/ashstone_bars_side_alt", "y": 90 } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_stairs.json new file mode 100644 index 00000000..c525b0b6 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_bricks.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_bricks.json new file mode 100644 index 00000000..55a7d042 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "aesthetics:block/ashstone_bricks" } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_door.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_door.json new file mode 100644 index 00000000..f8742abc --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_door.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_bars.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_bars.json new file mode 100644 index 00000000..d0dc813b --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_bars.json @@ -0,0 +1,32 @@ +{ + "multipart": [ + { "apply": { "model": "aesthetics:block/dragonstone_bars_post_ends" }}, + { "when": { "north": false, "east": false, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/dragonstone_bars_post" } + }, + { "when": { "north": true, "east": false, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/dragonstone_bars_cap" } + }, + { "when": { "north": false, "east": true, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/dragonstone_bars_cap", "y": 90 } + }, + { "when": { "north": false, "east": false, "south": true, "west": false }, + "apply": { "model": "aesthetics:block/dragonstone_bars_cap_alt" } + }, + { "when": { "north": false, "east": false, "south": false, "west": true }, + "apply": { "model": "aesthetics:block/dragonstone_bars_cap_alt", "y": 90 } + }, + { "when": { "north": true }, + "apply": { "model": "aesthetics:block/dragonstone_bars_side" } + }, + { "when": { "east": true }, + "apply": { "model": "aesthetics:block/dragonstone_bars_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "aesthetics:block/dragonstone_bars_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "aesthetics:block/dragonstone_bars_side_alt", "y": 90 } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_stairs.json new file mode 100644 index 00000000..dc25ca6f --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_bricks.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_bricks.json new file mode 100644 index 00000000..90a3b75a --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "aesthetics:block/dragonstone_bricks" } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_door.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_door.json new file mode 100644 index 00000000..20f7d8d9 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_door.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_bars.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_bars.json new file mode 100644 index 00000000..16d45cba --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_bars.json @@ -0,0 +1,32 @@ +{ + "multipart": [ + { "apply": { "model": "aesthetics:block/fyrite_bars_post_ends" }}, + { "when": { "north": false, "east": false, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/fyrite_bars_post" } + }, + { "when": { "north": true, "east": false, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/fyrite_bars_cap" } + }, + { "when": { "north": false, "east": true, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/fyrite_bars_cap", "y": 90 } + }, + { "when": { "north": false, "east": false, "south": true, "west": false }, + "apply": { "model": "aesthetics:block/fyrite_bars_cap_alt" } + }, + { "when": { "north": false, "east": false, "south": false, "west": true }, + "apply": { "model": "aesthetics:block/fyrite_bars_cap_alt", "y": 90 } + }, + { "when": { "north": true }, + "apply": { "model": "aesthetics:block/fyrite_bars_side" } + }, + { "when": { "east": true }, + "apply": { "model": "aesthetics:block/fyrite_bars_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "aesthetics:block/fyrite_bars_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "aesthetics:block/fyrite_bars_side_alt", "y": 90 } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_stairs.json new file mode 100644 index 00000000..57f745a8 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_bricks.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_bricks.json new file mode 100644 index 00000000..78b30ac8 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "aesthetics:block/fyrite_bricks" } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_door.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_door.json new file mode 100644 index 00000000..5c9d60f9 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_door.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_bars.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_bars.json new file mode 100644 index 00000000..bc7e9888 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_bars.json @@ -0,0 +1,32 @@ +{ + "multipart": [ + { "apply": { "model": "aesthetics:block/illumenite_bars_post_ends" }}, + { "when": { "north": false, "east": false, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/illumenite_bars_post" } + }, + { "when": { "north": true, "east": false, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/illumenite_bars_cap" } + }, + { "when": { "north": false, "east": true, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/illumenite_bars_cap", "y": 90 } + }, + { "when": { "north": false, "east": false, "south": true, "west": false }, + "apply": { "model": "aesthetics:block/illumenite_bars_cap_alt" } + }, + { "when": { "north": false, "east": false, "south": false, "west": true }, + "apply": { "model": "aesthetics:block/illumenite_bars_cap_alt", "y": 90 } + }, + { "when": { "north": true }, + "apply": { "model": "aesthetics:block/illumenite_bars_side" } + }, + { "when": { "east": true }, + "apply": { "model": "aesthetics:block/illumenite_bars_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "aesthetics:block/illumenite_bars_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "aesthetics:block/illumenite_bars_side_alt", "y": 90 } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_stairs.json new file mode 100644 index 00000000..448b5b09 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_bricks.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_bricks.json new file mode 100644 index 00000000..aa51d807 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "aesthetics:block/illumenite_bricks" } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_door.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_door.json new file mode 100644 index 00000000..5d8419e6 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_door.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_bars.json b/src/main/resources/assets/netherrocks/blockstates/malachite_bars.json new file mode 100644 index 00000000..4042f1a2 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_bars.json @@ -0,0 +1,32 @@ +{ + "multipart": [ + { "apply": { "model": "aesthetics:block/malachite_bars_post_ends" }}, + { "when": { "north": false, "east": false, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/malachite_bars_post" } + }, + { "when": { "north": true, "east": false, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/malachite_bars_cap" } + }, + { "when": { "north": false, "east": true, "south": false, "west": false }, + "apply": { "model": "aesthetics:block/malachite_bars_cap", "y": 90 } + }, + { "when": { "north": false, "east": false, "south": true, "west": false }, + "apply": { "model": "aesthetics:block/malachite_bars_cap_alt" } + }, + { "when": { "north": false, "east": false, "south": false, "west": true }, + "apply": { "model": "aesthetics:block/malachite_bars_cap_alt", "y": 90 } + }, + { "when": { "north": true }, + "apply": { "model": "aesthetics:block/malachite_bars_side" } + }, + { "when": { "east": true }, + "apply": { "model": "aesthetics:block/malachite_bars_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "aesthetics:block/malachite_bars_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "aesthetics:block/malachite_bars_side_alt", "y": 90 } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/malachite_brick_stairs.json new file mode 100644 index 00000000..ff944c6b --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_brick_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_bricks.json b/src/main/resources/assets/netherrocks/blockstates/malachite_bricks.json new file mode 100644 index 00000000..e47ae509 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "aesthetics:block/malachite_bricks" } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_door.json b/src/main/resources/assets/netherrocks/blockstates/malachite_door.json new file mode 100644 index 00000000..ab52f2b5 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_door.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/netherrocks/lang/en_us.json b/src/main/resources/assets/netherrocks/lang/en_us.json index 82a0d81c..56563e30 100644 --- a/src/main/resources/assets/netherrocks/lang/en_us.json +++ b/src/main/resources/assets/netherrocks/lang/en_us.json @@ -98,6 +98,34 @@ "item.netherrocks.dragonstone_leggings": "Dragonstone Leggings", "item.netherrocks.dragonstone_boots": "Dragonstone Boots", + "block.netherrocks.fyrite_bricks": "Fyrite Bricks", + "block.netherrocks.malachite_bricks": "Malachite Bricks", + "block.netherrocks.ashstone_bricks": "Ashstone Bricks", + "block.netherrocks.illumenite_bricks": "Illumenite Bricks", + "block.netherrocks.dragonstone_bricks": "Dragonstone Bricks", + "block.netherrocks.argonite_bricks": "Argonite Bricks", + + "block.netherrocks.fyrite_brick_stairs": "Fyrite Brick Stairs", + "block.netherrocks.malachite_brick_stairs": "Malachite Brick Stairs", + "block.netherrocks.ashstone_brick_stairs": "Ashstone Brick Stairs", + "block.netherrocks.illumenite_brick_stairs": "Illumenite Brick Stairs", + "block.netherrocks.dragonstone_brick_stairs": "Dragonstone Brick Stairs", + "block.netherrocks.argonite_brick_stairs": "Argonite Brick Stairs", + + "block.netherrocks.fyrite_bars": "Fyrite Bars", + "block.netherrocks.malachite_bars": "Malachite Bars", + "block.netherrocks.ashstone_bars": "Ashstone Bars", + "block.netherrocks.illumenite_bars": "Illumenite Bars", + "block.netherrocks.dragonstone_bars": "Dragonstone Bars", + "block.netherrocks.argonite_bars": "Argonite Bars", + + "block.netherrocks.argonite_door": "Argonite Door", + "block.netherrocks.ashstone_door": "Ashstone Door", + "block.netherrocks.dragonstone_door": "Dragonstone Door", + "block.netherrocks.fyrite_door": "Fyrite Door", + "block.netherrocks.illumenite_door": "Illumenite Door", + "block.netherrocks.malachite_door": "Malachite Door", + "container.nether_furnace": "Nether Furnace", "gui.netherrocks.smeltTimeProgress": "Smelt time %s/%s", "gui.netherrocks.fuelBurnTimeProgress": "Fuel burn time %s/%s", diff --git a/src/main/resources/assets/netherrocks/lang/fr_fr.json b/src/main/resources/assets/netherrocks/lang/fr_fr.json index 03ce3616..f90ddc34 100644 --- a/src/main/resources/assets/netherrocks/lang/fr_fr.json +++ b/src/main/resources/assets/netherrocks/lang/fr_fr.json @@ -63,6 +63,33 @@ "item.netherrocks.dragonstone_chestplate": "Plastron en Dragonstone", "item.netherrocks.dragonstone_leggings": "Jambières en Dragonstone", "item.netherrocks.dragonstone_boots": "Bottes en Dragonstone", + "block.netherrocks.fyrite_bricks": "Brique de Fyrite", + "block.netherrocks.malachite_bricks": "Brique de Malachite", + "block.netherrocks.ashstone_bricks": "Brique d'Ashstone", + "block.netherrocks.illumenite_bricks": "Brique d'Illumenite", + "block.netherrocks.dragonstone_bricks": "Brique de Dragonstone", + "block.netherrocks.argonite_bricks": "Brique d'Argonite", + + "block.netherrocks.fyrite_brick_stairs": "Escalier en Brique de Fyrite", + "block.netherrocks.malachite_brick_stairs": "Escalier en Brique de Malachite", + "block.netherrocks.ashstone_brick_stairs": "Escalier en Brique d'Ashstone", + "block.netherrocks.illumenite_brick_stairs": "Escalier en Brique d'Illumenite", + "block.netherrocks.dragonstone_brick_stairs": "Escalier en Brique de Dragonstone", + "block.netherrocks.argonite_brick_stairs": "Escalier en Brique d'Argonite", + + "block.netherrocks.fyrite_bars": "Barreaux de Fyrite", + "block.netherrocks.malachite_bars": "Barreaux de Malachite", + "block.netherrocks.ashstone_bars": "Barreaux d'Ashstone", + "block.netherrocks.illumenite_bars": "Barreaux d'Illumenite", + "block.netherrocks.dragonstone_bars": "Barreaux de Dragonstone", + "block.netherrocks.argonite_bars": "Barreaux d'Argonite", + + "block.netherrocks.argonite_door": "Porte en Argonite", + "block.netherrocks.ashstone_door": "Porte en Ashstone", + "block.netherrocks.dragonstone_door": "Porte en Dragonstone", + "block.netherrocks.fyrite_door": "Porte en Fyrite", + "block.netherrocks.illumenite_door": "Porte en Illumenite", + "block.netherrocks.malachite_door": "Porte en Malachite", "container.netherrocks_nether_furnace": "Fourneau du Nether", "nether_furnace_gui": "Fourneau du Nether", @@ -101,4 +128,4 @@ "netherrocks.fyrite_pickaxe.info": "§aFonte automatique lors du minage.", "netherrocks.fyrite_sword.info": "§aExploite le pouvoir du feu.", "netherrocks.illumenite_sword.info": "§aDonne la vision nocturne au coups. Aveugle et ralentit la cible." -} \ No newline at end of file +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap.json new file mode 100644 index 00000000..73e00591 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/argonite_bars", + "bars": "aesthetics:block/argonite_bars", + "edge": "aesthetics:block/argonite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap_alt.json new file mode 100644 index 00000000..421e9907 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/argonite_bars", + "bars": "aesthetics:block/argonite_bars", + "edge": "aesthetics:block/argonite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_post.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_post.json new file mode 100644 index 00000000..9852c8ad --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/argonite_bars", + "bars": "aesthetics:block/argonite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_post_ends.json new file mode 100644 index 00000000..072ba742 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/argonite_bars", + "edge": "aesthetics:block/argonite_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_side.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_side.json new file mode 100644 index 00000000..3ac0cce8 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/argonite_bars", + "bars": "aesthetics:block/argonite_bars", + "edge": "aesthetics:block/argonite_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_side_alt.json new file mode 100644 index 00000000..c0f19e95 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/argonite_bars", + "bars": "aesthetics:block/argonite_bars", + "edge": "aesthetics:block/argonite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/argonite_brick_inner_stairs.json new file mode 100644 index 00000000..dee36c38 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "aesthetics:block/argonite_bricks", + "top": "aesthetics:block/argonite_bricks", + "side": "aesthetics:block/argonite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/argonite_brick_outer_stairs.json new file mode 100644 index 00000000..fcb2e2db --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "aesthetics:block/argonite_bricks", + "top": "aesthetics:block/argonite_bricks", + "side": "aesthetics:block/argonite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/argonite_brick_stairs.json new file mode 100644 index 00000000..f30db254 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "aesthetics:block/argonite_bricks", + "top": "aesthetics:block/argonite_bricks", + "side": "aesthetics:block/argonite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bricks.json b/src/main/resources/assets/netherrocks/models/block/argonite_bricks.json new file mode 100644 index 00000000..837ed523 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "aesthetics:block/argonite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom.json new file mode 100644 index 00000000..b02cadc7 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "aesthetics:block/argonite_door_lower", + "top": "aesthetics:block/argonite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom_rh.json new file mode 100644 index 00000000..ed49b83f --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "aesthetics:block/argonite_door_lower", + "top": "aesthetics:block/argonite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_door_top.json b/src/main/resources/assets/netherrocks/models/block/argonite_door_top.json new file mode 100644 index 00000000..66645027 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "aesthetics:block/argonite_door_lower", + "top": "aesthetics:block/argonite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/argonite_door_top_rh.json new file mode 100644 index 00000000..e666dd32 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "aesthetics:block/argonite_door_lower", + "top": "aesthetics:block/argonite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap.json new file mode 100644 index 00000000..459416e7 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/ashstone_bars", + "bars": "aesthetics:block/ashstone_bars", + "edge": "aesthetics:block/ashstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap_alt.json new file mode 100644 index 00000000..42ee0830 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/ashstone_bars", + "bars": "aesthetics:block/ashstone_bars", + "edge": "aesthetics:block/ashstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post.json new file mode 100644 index 00000000..a92fc4fc --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/ashstone_bars", + "bars": "aesthetics:block/ashstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post_ends.json new file mode 100644 index 00000000..0325242d --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/ashstone_bars", + "edge": "aesthetics:block/ashstone_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side.json new file mode 100644 index 00000000..c413d3c1 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/ashstone_bars", + "bars": "aesthetics:block/ashstone_bars", + "edge": "aesthetics:block/ashstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side_alt.json new file mode 100644 index 00000000..0a528b7b --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/ashstone_bars", + "bars": "aesthetics:block/ashstone_bars", + "edge": "aesthetics:block/ashstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_inner_stairs.json new file mode 100644 index 00000000..8c9d081d --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "aesthetics:block/ashstone_bricks", + "top": "aesthetics:block/ashstone_bricks", + "side": "aesthetics:block/ashstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_outer_stairs.json new file mode 100644 index 00000000..f6489e40 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "aesthetics:block/ashstone_bricks", + "top": "aesthetics:block/ashstone_bricks", + "side": "aesthetics:block/ashstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_stairs.json new file mode 100644 index 00000000..fe980b04 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "aesthetics:block/ashstone_bricks", + "top": "aesthetics:block/ashstone_bricks", + "side": "aesthetics:block/ashstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bricks.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bricks.json new file mode 100644 index 00000000..eef4ab96 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "aesthetics:block/ashstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom.json new file mode 100644 index 00000000..14e588aa --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "aesthetics:block/ashstone_door_lower", + "top": "aesthetics:block/ashstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom_rh.json new file mode 100644 index 00000000..f8fdf458 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "aesthetics:block/ashstone_door_lower", + "top": "aesthetics:block/ashstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_door_top.json b/src/main/resources/assets/netherrocks/models/block/ashstone_door_top.json new file mode 100644 index 00000000..8b21e374 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "aesthetics:block/ashstone_door_lower", + "top": "aesthetics:block/ashstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/ashstone_door_top_rh.json new file mode 100644 index 00000000..3b9fed96 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "aesthetics:block/ashstone_door_lower", + "top": "aesthetics:block/ashstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap.json new file mode 100644 index 00000000..85e11102 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/dragonstone_bars", + "bars": "aesthetics:block/dragonstone_bars", + "edge": "aesthetics:block/dragonstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap_alt.json new file mode 100644 index 00000000..c502cee3 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/dragonstone_bars", + "bars": "aesthetics:block/dragonstone_bars", + "edge": "aesthetics:block/dragonstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post.json new file mode 100644 index 00000000..52257d32 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/dragonstone_bars", + "bars": "aesthetics:block/dragonstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post_ends.json new file mode 100644 index 00000000..abcaa01a --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/dragonstone_bars", + "edge": "aesthetics:block/dragonstone_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side.json new file mode 100644 index 00000000..c23acf05 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/dragonstone_bars", + "bars": "aesthetics:block/dragonstone_bars", + "edge": "aesthetics:block/dragonstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side_alt.json new file mode 100644 index 00000000..28c0ea3d --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/dragonstone_bars", + "bars": "aesthetics:block/dragonstone_bars", + "edge": "aesthetics:block/dragonstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_inner_stairs.json new file mode 100644 index 00000000..bf685b12 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "aesthetics:block/dragonstone_bricks", + "top": "aesthetics:block/dragonstone_bricks", + "side": "aesthetics:block/dragonstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_outer_stairs.json new file mode 100644 index 00000000..f79bba56 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "aesthetics:block/dragonstone_bricks", + "top": "aesthetics:block/dragonstone_bricks", + "side": "aesthetics:block/dragonstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_stairs.json new file mode 100644 index 00000000..44b98de7 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "aesthetics:block/dragonstone_bricks", + "top": "aesthetics:block/dragonstone_bricks", + "side": "aesthetics:block/dragonstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bricks.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bricks.json new file mode 100644 index 00000000..4dc0fa6d --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "aesthetics:block/dragonstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom.json new file mode 100644 index 00000000..7da84f26 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "aesthetics:block/dragonstone_door_lower", + "top": "aesthetics:block/dragonstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom_rh.json new file mode 100644 index 00000000..4f58bb69 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "aesthetics:block/dragonstone_door_lower", + "top": "aesthetics:block/dragonstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top.json new file mode 100644 index 00000000..cc8fbfeb --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "aesthetics:block/dragonstone_door_lower", + "top": "aesthetics:block/dragonstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top_rh.json new file mode 100644 index 00000000..ee07d97f --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "aesthetics:block/dragonstone_door_lower", + "top": "aesthetics:block/dragonstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap.json new file mode 100644 index 00000000..fd925859 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/fyrite_bars", + "bars": "aesthetics:block/fyrite_bars", + "edge": "aesthetics:block/fyrite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap_alt.json new file mode 100644 index 00000000..23676988 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/fyrite_bars", + "bars": "aesthetics:block/fyrite_bars", + "edge": "aesthetics:block/fyrite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post.json new file mode 100644 index 00000000..20d3e51c --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/fyrite_bars", + "bars": "aesthetics:block/fyrite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post_ends.json new file mode 100644 index 00000000..d3e9b17c --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/fyrite_bars", + "edge": "aesthetics:block/fyrite_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side.json new file mode 100644 index 00000000..db539389 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/fyrite_bars", + "bars": "aesthetics:block/fyrite_bars", + "edge": "aesthetics:block/fyrite_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side_alt.json new file mode 100644 index 00000000..afe585ad --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/fyrite_bars", + "bars": "aesthetics:block/fyrite_bars", + "edge": "aesthetics:block/fyrite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_inner_stairs.json new file mode 100644 index 00000000..dfab3055 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "aesthetics:block/fyrite_bricks", + "top": "aesthetics:block/fyrite_bricks", + "side": "aesthetics:block/fyrite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_outer_stairs.json new file mode 100644 index 00000000..f17d90de --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "aesthetics:block/fyrite_bricks", + "top": "aesthetics:block/fyrite_bricks", + "side": "aesthetics:block/fyrite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_stairs.json new file mode 100644 index 00000000..23f016df --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "aesthetics:block/fyrite_bricks", + "top": "aesthetics:block/fyrite_bricks", + "side": "aesthetics:block/fyrite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bricks.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bricks.json new file mode 100644 index 00000000..4d90130b --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "aesthetics:block/fyrite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom.json new file mode 100644 index 00000000..9cd13bd2 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "aesthetics:block/fyrite_door_lower", + "top": "aesthetics:block/fyrite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom_rh.json new file mode 100644 index 00000000..2c943b2b --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "aesthetics:block/fyrite_door_lower", + "top": "aesthetics:block/fyrite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_door_top.json b/src/main/resources/assets/netherrocks/models/block/fyrite_door_top.json new file mode 100644 index 00000000..fb4021d2 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "aesthetics:block/fyrite_door_lower", + "top": "aesthetics:block/fyrite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/fyrite_door_top_rh.json new file mode 100644 index 00000000..fcf0b856 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "aesthetics:block/fyrite_door_lower", + "top": "aesthetics:block/fyrite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap.json new file mode 100644 index 00000000..6ab44723 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/illumenite_bars", + "bars": "aesthetics:block/illumenite_bars", + "edge": "aesthetics:block/illumenite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap_alt.json new file mode 100644 index 00000000..017c18e1 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/illumenite_bars", + "bars": "aesthetics:block/illumenite_bars", + "edge": "aesthetics:block/illumenite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post.json new file mode 100644 index 00000000..d9279bb3 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/illumenite_bars", + "bars": "aesthetics:block/illumenite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post_ends.json new file mode 100644 index 00000000..8039434b --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/illumenite_bars", + "edge": "aesthetics:block/illumenite_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side.json new file mode 100644 index 00000000..3aacce10 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/illumenite_bars", + "bars": "aesthetics:block/illumenite_bars", + "edge": "aesthetics:block/illumenite_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side_alt.json new file mode 100644 index 00000000..9e4d9c71 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/illumenite_bars", + "bars": "aesthetics:block/illumenite_bars", + "edge": "aesthetics:block/illumenite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_inner_stairs.json new file mode 100644 index 00000000..f1cae384 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "aesthetics:block/illumenite_bricks", + "top": "aesthetics:block/illumenite_bricks", + "side": "aesthetics:block/illumenite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_outer_stairs.json new file mode 100644 index 00000000..d0625823 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "aesthetics:block/illumenite_bricks", + "top": "aesthetics:block/illumenite_bricks", + "side": "aesthetics:block/illumenite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_stairs.json new file mode 100644 index 00000000..a1d165bf --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "aesthetics:block/illumenite_bricks", + "top": "aesthetics:block/illumenite_bricks", + "side": "aesthetics:block/illumenite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bricks.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bricks.json new file mode 100644 index 00000000..d235cb12 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "aesthetics:block/illumenite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom.json new file mode 100644 index 00000000..ae9e2c54 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "aesthetics:block/illumenite_door_lower", + "top": "aesthetics:block/illumenite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom_rh.json new file mode 100644 index 00000000..e87b3c1b --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "aesthetics:block/illumenite_door_lower", + "top": "aesthetics:block/illumenite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_door_top.json b/src/main/resources/assets/netherrocks/models/block/illumenite_door_top.json new file mode 100644 index 00000000..70979d43 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "aesthetics:block/illumenite_door_lower", + "top": "aesthetics:block/illumenite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/illumenite_door_top_rh.json new file mode 100644 index 00000000..9f2bde7d --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "aesthetics:block/illumenite_door_lower", + "top": "aesthetics:block/illumenite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap.json new file mode 100644 index 00000000..60d9c779 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/malachite_bars", + "bars": "aesthetics:block/malachite_bars", + "edge": "aesthetics:block/malachite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap_alt.json new file mode 100644 index 00000000..c4ba3d0d --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/malachite_bars", + "bars": "aesthetics:block/malachite_bars", + "edge": "aesthetics:block/malachite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_post.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_post.json new file mode 100644 index 00000000..16e9e53a --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/malachite_bars", + "bars": "aesthetics:block/malachite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_post_ends.json new file mode 100644 index 00000000..5cd2f8f1 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/malachite_bars", + "edge": "aesthetics:block/malachite_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_side.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_side.json new file mode 100644 index 00000000..3e5725fb --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/malachite_bars", + "bars": "aesthetics:block/malachite_bars", + "edge": "aesthetics:block/malachite_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_side_alt.json new file mode 100644 index 00000000..c407ac03 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "aesthetics:block/malachite_bars", + "bars": "aesthetics:block/malachite_bars", + "edge": "aesthetics:block/malachite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/malachite_brick_inner_stairs.json new file mode 100644 index 00000000..87fea06d --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "aesthetics:block/malachite_bricks", + "top": "aesthetics:block/malachite_bricks", + "side": "aesthetics:block/malachite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/malachite_brick_outer_stairs.json new file mode 100644 index 00000000..8d8e138b --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "aesthetics:block/malachite_bricks", + "top": "aesthetics:block/malachite_bricks", + "side": "aesthetics:block/malachite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/malachite_brick_stairs.json new file mode 100644 index 00000000..2dcb586d --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "aesthetics:block/malachite_bricks", + "top": "aesthetics:block/malachite_bricks", + "side": "aesthetics:block/malachite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bricks.json b/src/main/resources/assets/netherrocks/models/block/malachite_bricks.json new file mode 100644 index 00000000..c947bfca --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "aesthetics:block/malachite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom.json new file mode 100644 index 00000000..bea3dce3 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "aesthetics:block/malachite_door_lower", + "top": "aesthetics:block/malachite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom_rh.json new file mode 100644 index 00000000..1c8655c6 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "aesthetics:block/malachite_door_lower", + "top": "aesthetics:block/malachite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_door_top.json b/src/main/resources/assets/netherrocks/models/block/malachite_door_top.json new file mode 100644 index 00000000..4ee310c5 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "aesthetics:block/malachite_door_lower", + "top": "aesthetics:block/malachite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/malachite_door_top_rh.json new file mode 100644 index 00000000..8348ef19 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "aesthetics:block/malachite_door_lower", + "top": "aesthetics:block/malachite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/item/argonite_bars.json b/src/main/resources/assets/netherrocks/models/item/argonite_bars.json new file mode 100644 index 00000000..b34feda7 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/argonite_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "aesthetics:block/argonite_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/argonite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/argonite_brick_stairs.json new file mode 100644 index 00000000..b129e535 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/argonite_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "aesthetics:block/argonite_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/argonite_bricks.json b/src/main/resources/assets/netherrocks/models/item/argonite_bricks.json new file mode 100644 index 00000000..1dab0ba8 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/argonite_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "aesthetics:block/argonite_bricks" +} diff --git a/src/main/resources/assets/netherrocks/models/item/argonite_door.json b/src/main/resources/assets/netherrocks/models/item/argonite_door.json new file mode 100644 index 00000000..79af218f --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/argonite_door.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "aesthetics:item/argonite_door" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/ashstone_bars.json b/src/main/resources/assets/netherrocks/models/item/ashstone_bars.json new file mode 100644 index 00000000..7608f806 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/ashstone_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "aesthetics:block/ashstone_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/ashstone_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/ashstone_brick_stairs.json new file mode 100644 index 00000000..69e4b2d3 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/ashstone_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "aesthetics:block/ashstone_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/ashstone_bricks.json b/src/main/resources/assets/netherrocks/models/item/ashstone_bricks.json new file mode 100644 index 00000000..96b88bd0 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/ashstone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "aesthetics:block/ashstone_bricks" +} diff --git a/src/main/resources/assets/netherrocks/models/item/ashstone_door.json b/src/main/resources/assets/netherrocks/models/item/ashstone_door.json new file mode 100644 index 00000000..15d0a0ed --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/ashstone_door.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "aesthetics:item/ashstone_door" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/dragonstone_bars.json b/src/main/resources/assets/netherrocks/models/item/dragonstone_bars.json new file mode 100644 index 00000000..8745707f --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/dragonstone_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "aesthetics:block/dragonstone_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_stairs.json new file mode 100644 index 00000000..d851c66c --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "aesthetics:block/dragonstone_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/dragonstone_bricks.json b/src/main/resources/assets/netherrocks/models/item/dragonstone_bricks.json new file mode 100644 index 00000000..fa4a7010 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/dragonstone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "aesthetics:block/dragonstone_bricks" +} diff --git a/src/main/resources/assets/netherrocks/models/item/dragonstone_door.json b/src/main/resources/assets/netherrocks/models/item/dragonstone_door.json new file mode 100644 index 00000000..6e0eee7e --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/dragonstone_door.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "aesthetics:item/dragonstone_door" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/fyrite_bars.json b/src/main/resources/assets/netherrocks/models/item/fyrite_bars.json new file mode 100644 index 00000000..6fa9815a --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/fyrite_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "aesthetics:block/fyrite_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/fyrite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/fyrite_brick_stairs.json new file mode 100644 index 00000000..f15f7fdd --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/fyrite_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "aesthetics:block/fyrite_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/fyrite_bricks.json b/src/main/resources/assets/netherrocks/models/item/fyrite_bricks.json new file mode 100644 index 00000000..d8596f13 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/fyrite_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "aesthetics:block/fyrite_bricks" +} diff --git a/src/main/resources/assets/netherrocks/models/item/fyrite_door.json b/src/main/resources/assets/netherrocks/models/item/fyrite_door.json new file mode 100644 index 00000000..b30a48c6 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/fyrite_door.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "aesthetics:item/fyrite_door" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/illumenite_bars.json b/src/main/resources/assets/netherrocks/models/item/illumenite_bars.json new file mode 100644 index 00000000..0ae57cc8 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/illumenite_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "aesthetics:block/illumenite_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/illumenite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/illumenite_brick_stairs.json new file mode 100644 index 00000000..5fbf89b2 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/illumenite_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "aesthetics:block/illumenite_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/illumenite_bricks.json b/src/main/resources/assets/netherrocks/models/item/illumenite_bricks.json new file mode 100644 index 00000000..b1cd36c4 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/illumenite_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "aesthetics:block/illumenite_bricks" +} diff --git a/src/main/resources/assets/netherrocks/models/item/illumenite_door.json b/src/main/resources/assets/netherrocks/models/item/illumenite_door.json new file mode 100644 index 00000000..8595e9b9 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/illumenite_door.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "aesthetics:item/illumenite_door" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/malachite_bars.json b/src/main/resources/assets/netherrocks/models/item/malachite_bars.json new file mode 100644 index 00000000..154ed52a --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/malachite_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "aesthetics:block/malachite_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/malachite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/malachite_brick_stairs.json new file mode 100644 index 00000000..2b0b3838 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/malachite_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "aesthetics:block/malachite_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/malachite_bricks.json b/src/main/resources/assets/netherrocks/models/item/malachite_bricks.json new file mode 100644 index 00000000..e7c53ca0 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/malachite_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "aesthetics:block/malachite_bricks" +} diff --git a/src/main/resources/assets/netherrocks/models/item/malachite_door.json b/src/main/resources/assets/netherrocks/models/item/malachite_door.json new file mode 100644 index 00000000..8fd537d6 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/malachite_door.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "aesthetics:item/malachite_door" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/textures/block/argonite_bars.png b/src/main/resources/assets/netherrocks/textures/block/argonite_bars.png new file mode 100644 index 0000000000000000000000000000000000000000..66d3071307dec387911c089381eae40a717961b3 GIT binary patch literal 530 zcmV+t0`2{YP)N2bZe?^J zG%heMHD!e|WdHyHkV!;AR5(v{QcX(&Q52nJjx$EIC?Z;fkbPK0sf>=PWh9nHhMHNH zf>A^Sh4w`stB49}+oqN+`jNLeGkBXfV~fMQcg}fl?!E6wL}Vg8uuD^N!dO~+Al1K3 zlX6_(vLg+e_AWBV!h7qB;=VEq|8clrLe`lR%+2IAm4YXf8Lkud9}nLYR@T@IK(klM z!cFy+=9MgklvUG!gW$05c!1@>8U^JPb1dwH&PY=?SO5xvBUc611xe;uh^ToQ^F&wx za5&)61nw|>+r0wx991`20CZo;^)m43z9Mtdaps-}wlcKO0;4<7vQDrJ{HjbjCY9z0R1NVDlRT&A7W?W3K@*>QN&1k{dFP_So#LDcc5$`S)!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKs4Cji z#WBRfKUpAUk_x9`#)hcFf)o1Bv?`|*vPJJJ;Fy$tvDxE*>xM34hMxs2QyiWh65M3* zvW_8X$L|S(dW9?4c62LpJmOjNNP)NDyP|T;qs1Q^dI~x(TggRyVQ79Iwz2)mYJH$J N44$rjF6*2UngDQTM{ocD literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/argonite_door_lower.png b/src/main/resources/assets/netherrocks/textures/block/argonite_door_lower.png new file mode 100644 index 0000000000000000000000000000000000000000..5c021772da9a373047c75b217c1f0e84c26464d0 GIT binary patch literal 608 zcmV-m0-ybfP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyH!bwCyR5(vnlIcqV zQ541Bmp+Wn3`A5AQC~{iH*?gqOm@4kD^ zJx^6lp5DUH?Q-N~d*BALH+B!M7T#97P9ZyqJNjGktK;<3TI_7NVnyAre;!Ug0$O(~ zAK*Iwj^H5qKs}#*ImtXD!)qaM*lo_L$IUNBMZ*wqImWmyg^p9ctz7&5O!IEc%qpfg z`Y!2`ikc4|;Y1#W5|yh1<%@tM6E&Nl%g87)V7A_KK_xVm0Fb%XJ(L)WJ=^HS%o%l& zdzF05Nmc=KWXRMP0G#CzTR4=f0hK&@U<6r_bdb$-`BF2=Zk6U{3w^+$%8$|22T`$&9LDmzx~TF9qaJ}vaiU0AhR(7Cc|wct10qQ*kE?p^W#0000J%=P)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyHp-DtRR5(vm zVHC#iFTSX)r1-`cDMgZ`y)d*S^0FQ_vze?hkuhtSF*TwPAN;|G-_e=%^sKJ#`#CSy zbzbhd#r{2shtrbi%gX9dQFbRQapri}4#hPnTO#S!>JX`jb>QpB0DEYjGA_ zUTVrgq%LPGj~Yk%Py0GvfGw6}E1m3{h#m(E&CpG(jcE&s?b^H(izApX&x? z2H8<3Cl=ljH_$VzAE^2R8`*d5Kgdqy$-#Yb5O$U;ly3hf6W2YUkmGs290-pgpc{&4_V5TI0si+d{ zx7SiH+8Xc2k!b7k2et}dfir*@VIH5ZgbHZGA4tDJ#LR&BI4!U~KB$E0LS~>;e4N09 zsEQdyLMd^SZ_ak7qy-!p?SEmg*-#~0LUn7jtalI#Z~xDL zAd>7|kc=vJY^;qWgxEibhP=P0%&K6=X)1s_f!sGnj`g${)T1F!egG(FKSDZ;3rzq3 N002ovPDHLkV1k2}?*#w= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/ashstone_bars.png b/src/main/resources/assets/netherrocks/textures/block/ashstone_bars.png new file mode 100644 index 0000000000000000000000000000000000000000..0c03dbd78acbd0cb6f8268a08469609d81915fe0 GIT binary patch literal 484 zcmVN2bZe?^J zG%heMHD!e|WdHyHVo5|nR5(v{Qq9VOP!#l;TtxYkw970s(h8Im6kG%m77_$)3k4sc zWs6?&^o<`LyjqKaduQez?wNBWBC6s0KIyvtcl^Ht+wGP#O%u2%ifA&KFvr64`6SQt zSop=EfU2s@3Fgb?Li_!m!Z0Mj)k%;$u!LxFyLXsH69=c0x}GP zITnt`BiXji0+6O@?*~5%EEWqI3fJwD|ETI2y{cbj!9w&s@9J=!bU_PBr^>*SnxWC_T zVK>-}9aj{E1pvXqjL=XVAs0pQJp;7R?H8l!ZsOr^pxJE391C$A_gcVW$+9ePj^nhp alcW#2Uza^k&Y`*h0000!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKs4Cpk z#WBRfKly^XpurPGMg{p(POK*$@f0U0n3#wtF+M%aFw25@0zbP0rv|sELigl%>vVy_W)z4*}Q$iB} DAQL+z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/ashstone_door_lower.png b/src/main/resources/assets/netherrocks/textures/block/ashstone_door_lower.png new file mode 100644 index 0000000000000000000000000000000000000000..7958c0b56a4b10f378a9925d32b23e321d64cb8b GIT binary patch literal 554 zcmV+_0@eMAP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyHj7da6R5(vnl5dLv zVHCxmPcolkc7#kxES6n=v)LN+V$;?LA%wJ9NvJKp@cy2Akv%W2GiUBO&v{^c-(Rg( zGgUz3D$T{LuoV`=5RP@KlZe%f;~EX3E&(Ku?8wph6e(eEMca4 z7=}FR#GpI1TFvm$Znv>A`4SYZR*SlKPzW(5i}l}g#a#ytj-&1Q4C9APLnUw}v= zGZu>(eEPry`Fx(qnb;ttpvW0^Es;oE4a9I0pv3^95_@sEIy?3RxqXS(k04kH@yfNZ sHKfz&csvgCJnu>H$Q7>ZUWx1e0Y;@0)P_B|%m4rY07*qoM6N<$f~PI!g#Z8m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/ashstone_door_upper.png b/src/main/resources/assets/netherrocks/textures/block/ashstone_door_upper.png new file mode 100644 index 0000000000000000000000000000000000000000..9f721b72033a5cb6398a2c356314b809f4f5737b GIT binary patch literal 546 zcmV+-0^R+IP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyHgh@m}R5(v_ewWANp(u(%oCQ}^C3&99^?KDn5&%BH9pCqT zxm=3lgQ`^f2Fw&H%kl$kC^SMXa5x;)k!6|u{@gc^Ic0~PoW)`x&htF|fOQ<$wypL* zWk-1&$Krh7SE*A>P19)cvHkUWX&WryGXp@O_xmj{bX_MDKrY};OW27aPYWE6M;*w1 zzt;h6x7!ccN}8q$d36CyGaz1DV10a`gy~YufK+^(z=%-AjApZ$IOLmi7zPE*cH&1e#n}|nd3>y0 z70?0>jP}1U*lbYAmSEj%HhKs1`TTzd1d(L#f@D~+V`FV3LB#$+5CnfunN?98r?CL; k1aeQ3L{E!>JqQB%0m6!VkGn`uod5s;07*qoM6N<$f@zoI!2kdN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/dragonstone_bars.png b/src/main/resources/assets/netherrocks/textures/block/dragonstone_bars.png new file mode 100644 index 0000000000000000000000000000000000000000..7258002af44c39ffa90be5659604f66158d160d7 GIT binary patch literal 499 zcmVN2bZe?^J zG%heMHD!e|WdHyHaY;l$R5(v{QprjKK@^;W#u!HlL820J2p)1!P;o^if&rtrO9&D* z3M%fn1qC4xj0+-obOFD>o8bSIU6JX`ylD>w-S1UD>Q$Eopo-II7;}yF>iBmjP9ipD zMXeZb$8xAv(~YmeeaT$w(_wRBE8%+UCCfJ)d4fx3C zu%^fa34G|(91d~T7Qv!vh1-E1Y};PBH_3!g0S7FY25i{@q=R+3LGbaEF!4E^GArQD zyF$T%GEn{udHXJ7t(VNCHteFKRX2#EmZ0a$2y!3Chfx{o!*ypI77g1}@;?iCpJB{_ zTQ2dITR~p&3hE8L(2dvZ66k|-Czt`bg5>E2iy1+_A06}!;7_@Ey21TT`yPiwzS^GK zMCTv_LXdnn(qBy{)$soFQ1N6#lbP{pA(zIIOw(u>O@3d^nmynOa$kOxOk%mW3+pBY pSBaP>q6CAL66xGgwOTr1{Q}9>XoY=7qI>`V002ovPDHLkV1f=E&MN=_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/dragonstone_bricks.png b/src/main/resources/assets/netherrocks/textures/block/dragonstone_bricks.png new file mode 100644 index 0000000000000000000000000000000000000000..3e4a1a0135ccb714ca16aeed8042c4309dca94c9 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKs4B_R z#WBRf|Lw$$oCgeeSX^^Frb-&Qhn>*4SKqK_LS?<8_$%h+kKWH_zgc@_!*=}%rb1uM z))`ma(#Z(QKf%)Kw&ey?}4YxUPT Vc5Ya+C=6&DgQu&X%Q~loCIBjsOy~dr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/dragonstone_door_lower.png b/src/main/resources/assets/netherrocks/textures/block/dragonstone_door_lower.png new file mode 100644 index 0000000000000000000000000000000000000000..4e4e39bb3be8c754d0f4ea099c24e0a790063a50 GIT binary patch literal 611 zcmV-p0-XJcP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyH#Ysd#R5(vfk&R1J zVHCy>h=_s6KI-mnMP-SO5jw+SjFD+tL&jLbJ{pr6LkI~Gi$v{%EI$e@EQ&~1+NW03 z5dHi5z4u%$!Nb|}p7%V@dEPsj2+H?d^3#=b-?9nFZvHZ8)NUwcp*Bh zkAtyyefCzW^F!kFYD9$TFQff*Nky#>L~$YyL$9OlugqEo=Rvc z0U(>nGbk}ud$!SePNcuptmb1*vnrS)!}|*-0G#CzBOnrCIAB0!2r<#$#C#mJBG8#- zBJuOGqXj9IkDypP*+g8gvwo@>tVCq$m13KV=gKAKOEl0gnOYSS->P)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyHph-kQR5(v!QYi`MexO^;6D(f4fSo*@0ZcGcQn*x9 z2@cyo3)9*f@5hm7>k0?{ZY)I30AhrBe7X`Upp9@K{YDWp1LF5-f%Wl0B}^AG1Eu2Q z1SUjP%xJ5@BcOb9{%sZ%DBFpjk|AePl+NR0?K(tSz=6^J7Y3URRk9^i&-?224t9+I zb%IE;cR@0$*s-xTk`QA5VB4NDtAZV;sQ~T-azE>>)6-&5--$W-2XY%jIed1Hvj6}9 M07*qoM6N<$g46x)J^%m! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/fyrite_bars.png b/src/main/resources/assets/netherrocks/textures/block/fyrite_bars.png new file mode 100644 index 0000000000000000000000000000000000000000..96f27e65cd63958119b636fe09ad002fa379b65b GIT binary patch literal 521 zcmV+k0`~ohP)N2bZe?^J zG%heMHD!e|WdHyHhen_xAbD)w}QAci${d-S7L(J$?7w;}DU87^$Z7 z_HsV{*Qz&EMQ3fH-grG-C;Xls$lW#i9f;{csU8GQ<0S;-a+btwoWxiisd|5#9(!C( z1~9wmh!WV$(_PY~dj<%&h#qQ>1BhG=T}26q`7U}(ht{2HvNvFX%P4`DluL&#WqJVM z@=>c#2IR_c^agnIXU5#%r$1)>40zw%_i9J3=ComAv{nxQF<4=I8KAgJ8Ipx0iOEKC zVAwOSFSiQH#2^_t2(Amr;tbt(yY$3&;DtX}pQhJdQveyTp1?f#<<)wC%g15E7Somh zek#b*1HAvHGbF(871>Iw_Z2W(55fTflwk`gl}>D<>Vq948@>Q%{3MWZ0LFq0(_k1( zmK$@1SH1v0!7_}$%1UBBK@X7|Of(n~1wQ&>wAXB=^PPKsI?4G1+hMIYx?f>@00000 LNkvXXu0mjf#cJIO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/fyrite_bricks.png b/src/main/resources/assets/netherrocks/textures/block/fyrite_bricks.png new file mode 100644 index 0000000000000000000000000000000000000000..58875409a24e3ca69617b4c86d8bcb7d97053a38 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKs4B(N z#WBRf|Lw$uyax<;SmsYHYq-F7QE^w~^Oq%z8=t=Te1P%U)N>EspY%RfeCbf ztBdcID{kv#1o59f!qw}tw_T|2&hj^Zbaq&DNUr?e^n1$O?~9H|rAJ)zxbnX~py<8< ZgSP1=$)A}k4+HIE@O1TaS?83{1OV4iRF41v literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/fyrite_door_lower.png b/src/main/resources/assets/netherrocks/textures/block/fyrite_door_lower.png new file mode 100644 index 0000000000000000000000000000000000000000..fa17113c06ee544a432a505ccce2d48f1f182fdc GIT binary patch literal 629 zcmV-*0*d{KP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyH*GWV{R5(vflEF(< zVHCw5G4DMPkrsor5f{&#Omx)eIEf`g(hxO>sA$H7P80?riBQx+uzw>WB3ea@7A;)5 zY|$bLaS;&_5fKp)BGUJPzcW`J!r^kh``vTy`QA*hbvE?N6<<&N?QxNns_}Az=FE7+s~}ZlQ=1c{FsX-BnHs6M1*F1NJ%=P)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyHp-DtRR5(v^Ho-Y_Q*iUrdczA4^68-*RIN4ZCH}m=|Pj4o9TYX$TRl4Eh~co^m+iO`LQLI z;b~ut0J(rWoySfL3XGsLZw+y+8EcT+p6G(9xZTMBd?{>N`p$Y_3Sd@A8L4E|;EesY zVWqJ@iH#&3S0?belive~DWO`_59&jKmXQgh-aKM@pz+_PfTdvzQ9^eii$E$qPLL)- z6+L<@L4f?|d^rvvb3E}Q8FD6tbX`8i9-2rA>adNB|BHyUH>k8JF`dSExGO%p1Z1Za z9>u-jF1`amFlwJHgyH$HJM$ko}`vkUx N002ovPDHLkV1fal_wxV% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/illumenite_bars.png b/src/main/resources/assets/netherrocks/textures/block/illumenite_bars.png new file mode 100644 index 0000000000000000000000000000000000000000..52a55c002478dcbc7ccb76caed55e05b164e7652 GIT binary patch literal 492 zcmVN2bZe?^J zG%heMHD!e|WdHyHYDq*vR5(v{lF>`TP!z`fXM60Spdg}x`U{GZiXLi2EK8j=O4l%u zrH^}vKtx1D#3vE)K}7sIXSW^iZBzJpcfRl3aqqX20q{ow+b#2N~qP2 zMbnHB%VkcC^;!vzvn!frgtYj?8{rUKf1}&Y(i-p z1s=iE$t%}C#%yTKB@_xfVkjC>Gl#~3sgS>nthDB0N??_gNqk4Ab0L~$yci?OOePkx i*$qP*kMFeUMCKP>PBBPluO0{h0000!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKs4B+O z#WBRfKl#IFV?|EGH#Y)V-5u3mHhWVp4YLqworg`2S->Tn}U2_gV2c>3nwx4 zyZjD3{RQawllpC@*&S?ylS;F|vE~Ul0#zby{pk86rap!m$hVsO&A5A-67z6EL N@O1TaS?83{1OQaDKo$T1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/illumenite_door_lower.png b/src/main/resources/assets/netherrocks/textures/block/illumenite_door_lower.png new file mode 100644 index 0000000000000000000000000000000000000000..833b7de983a95bf46f4f417958b85eff80098cfd GIT binary patch literal 566 zcmV-60?GY}P)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyHm`OxIR5(vfl3Pnc zQ4odC59^os4=k#Oh#=^tmmnxAC@M~3Vp3t6ikIwe7s>}8L_~ZL5fKp)5fKq_`pzCY z2#dwqvuCZDebmZkw?tkFKsR_d{3-JBZ_CVP zw;1ws2AY7Y2`2SHBq5R(Nlhl#7`S^fRd#?u#%P-EMIr`Kb4(0}K@99b7#^6VVHQ9T zi4)d%rlqIT8w_8%pXt+G74)S&v?_h|zeSCy=+wOLKy`CTLbS?lD&}^Q8cznZRO227{u+d745CojEf)6( zqv8&sNFp2xty;MC0E0^95N0Me1SwQ>4#!Aj-BLviF99s3ps2!qIs=^v`h2eEL9hzq zRqMjR;EI*YZHL2as6b%Z=UepqmsBGZ6m8oJJHqz<0r6>ekc%X@fdBvi07*qoM6N<$ Ef|#1!N&o-= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/illumenite_door_upper.png b/src/main/resources/assets/netherrocks/textures/block/illumenite_door_upper.png new file mode 100644 index 0000000000000000000000000000000000000000..c63511bd75f67308b31e7c7cbf69f3aec034221c GIT binary patch literal 493 zcmV004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyHPf0{UR5(vZW&9x`B4Ve%-6P-aVBZ(aCop{Fu3WQUNtTJc7t**&J+_X>iX6XjG9yWaszo9U%P>z#L*4_ zL_ZD`un;gV;LMeXg9`yW;00I?s3LH!*8t@K@kPIbo(X2GMifxZ?S}fM`#(K-I|vwG$-e*;WXUr! zN2bZe?^J zG%heMHD!e|WdHyHs!2paR5(v{QcEj@VHlmQ`F!6Nk>-ZSSSrIlXBn70#Fp1 z({&&oIA~#x1?9Gzj7xPa0Jv=2sMm1SvCY3bz|6|i01JTW)uH?E1F0hjpPJWC%>phPT@5S%6_GXF1Nf!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKs4B+O z#WBRfKRKZ&OpViU!&&||Wd-?}-0mkH@%$-2t=O^j7NZiQ_(8363{MUV1~7qTmi%Vy zc=*oQZO4&?QV;an6grGIbTykCxZB=S(Aj^C+31j}-|LDMWef~8JSTqoq#t4j+QZ=K L>gTe~DWM4frNl=9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/block/malachite_door_lower.png b/src/main/resources/assets/netherrocks/textures/block/malachite_door_lower.png new file mode 100644 index 0000000000000000000000000000000000000000..bf36760f5988616d0c914c93f4a1152fc7d4d59d GIT binary patch literal 665 zcmV;K0%rY*P)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyH`$Y|H9;VD3?I{Fnnj4Uuv7@nk-pU#$^&M=18P5+SV zs9imYenYBf5P>+y7}xZ`@YUnq8-CBVlL6P^ONBZs_>nHDsA>LpIFSd@C0}=n_cb8N zmE*U-`rWF?fZ6Tf2P&bd1b|%k4>F0dwr3k1*WXv_L1a$nL#MN9pd&--Ngsf-93lfm zA`Ax%sE8OQ`ek1aM_n1v8tYG+;*sp_VpQr;yT*lo9mI`ylDwV3b@0NuRH^WY>-Z6@ zohIw&Q)};;)ZJzQot-9gs{t4j_Z3^LU(d}Ax4G$#)lD}#bM=vPrB<+1X|6q%S6dBy zWtC8vDzDe;W5)PxH004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyHvPnciR5(vZDNs`2aCP___Jb9LTh4INmy&_PnXWzFv95!Ka~bw8 zCE;Jmh<~l<&L4@f#r@u?bmb3asBoc$90241dvewL*w?ZcK468d8Yn~5>z!0U42M=w z2|C<;O|-jvQu>){U^6O?I%i_<3u0;#as5CwTsR)2_5M+DoHu0F#MGvfYBfqJS-ey7 zaD1$ItJh!vl^y_yCW3oGVKR6S2(Sy-b0y-`a83z2^9S0HHg{JW6whr{z*Jgt+X`|P z#5t!ufC*+Sg{`7WaX3Ee-;|qJdOwDPc3k1Yso*iP2M{C7Fu&0oHQ+7jF eTZ6juIwyZzmb{P=)uZYF0000gb;T$b4+%(R%x*D8(LYhJHR=mNK zc|p%y3&jBxdx7FWB-wyVC$FJ+fn)>F!+>N1P^<@XC^i5k7C`BoRDfatdH@k)n9^kJ UBI6Iwl0a%bUHx3vIVCg!0Li&bvj6}9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/item/ashstone_door.png b/src/main/resources/assets/netherrocks/textures/item/ashstone_door.png new file mode 100644 index 0000000000000000000000000000000000000000..12e5ad4bfb42ef119f79f6e06efed8dba4404a7e GIT binary patch literal 1166 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=DjSL74G){)!Z!AbW|YuPgfl4sjuA&KGGDpE5A8NPD_ChFAzP3b4HY4OB6}fDzgL z?(XjY$b4+<@87>O)Ya9&^|7EUDlILAOM(nU=cB7T7a$?8(&UN z4kesO_CiVuC~+VF#aEfMPw6L$LuUu>eZvqyiKJ e&YwR|s(ywmemc=2af{PH8a-Y8T-G@yGywp@9!(Jd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/item/dragonstone_door.png b/src/main/resources/assets/netherrocks/textures/item/dragonstone_door.png new file mode 100644 index 0000000000000000000000000000000000000000..25b7ce14ac681b5b6f4ea22932c0637629e47ddf GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J=4@yqg0@pFi#i9 z5DWk0AOHW`yGpE9(3EI>eEjII`2yQg(;2mnCNn77z2#MC(JX7!Fjnr8n8SGJh=fD6 zzQ7?7X$J!yj)#tNYzm%92AkwWn0s!{_%GZnSoP1Cfnm)Zo2^P$8&rTcFnGH9xvXI~f>Qq&;06Lo5Ut1z6ty2C5ifz=&-B z-?EVZ$b4+<|F_OFuxz-Cq7SYP-2iO-KLN@pmN3C}lgVH~*N4qkbTv5ngfxTXBSn}f z^TJ{qMHB~6>;;Mgkz@m6kK9M`0?7uThXKh3pjZ#&P;3B7EP&EEsQ|@*ug{;5s-NNH WOaleOo-;2%8a-Y8T-G@yGywpPO;LFO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/item/illumenite_door.png b/src/main/resources/assets/netherrocks/textures/item/illumenite_door.png new file mode 100644 index 0000000000000000000000000000000000000000..911104018229b59d9f15a19242bff6d4529b9286 GIT binary patch literal 1166 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=DjSL74G){)!Z!AbW|YuPgfl4sju6rC`@9aSRMB(w;7kAr^v+0xa);162$#U_`e6 z|No=^k@?uz-@iX#;Npsg>tjJz#K>q3mjoGz&PP|zgf2iTAHxOc-azN$wE$f)Hhxr; z4eoHlrUBVTko>oAOHmA<*b5W~BFP4%q)bQl6$3oZL89nkfT9x0K~G2|y8zu#iVZ-C j1(5Sd1t#WtDnm{r-UW|AtYz- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/netherrocks/textures/item/malachite_door.png b/src/main/resources/assets/netherrocks/textures/item/malachite_door.png new file mode 100644 index 0000000000000000000000000000000000000000..7cb77d5612e54b2f7735ed7b35bd92abb5cae344 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;RN#5=* z4F5rJ!QSPQfg+p*9+AZi419+`m{C;2s{ts;UgGKN%KnIpo7qs~xBI*qK%sO`7sn8b z)5!@E83#Jf2=2S{d;WyB`SbT1)ofhV{5sh&{6pCG8G<(*O6+!3sd?>fc*s-|-SJWE z;;dHv@Bf}hP53!qN#9_lXV7(S5q71MY=3rtozu7~(V<@dfv<gTe~DWM4fL*!D? literal 0 HcmV?d00001 From 2e97c62ed9c492bfb3fa0d94ea3977b1b862de4c Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 4 Sep 2021 19:03:40 -0500 Subject: [PATCH 44/56] renamed all 'aesthetics' to 'netherrocks' --- .../blockstates/argonite_bars.json | 20 ++--- .../blockstates/argonite_brick_stairs.json | 80 +++++++++---------- .../blockstates/argonite_bricks.json | 2 +- .../blockstates/argonite_door.json | 64 +++++++-------- .../blockstates/ashstone_bars.json | 20 ++--- .../blockstates/ashstone_brick_stairs.json | 80 +++++++++---------- .../blockstates/ashstone_bricks.json | 2 +- .../blockstates/ashstone_door.json | 64 +++++++-------- .../blockstates/dragonstone_bars.json | 20 ++--- .../blockstates/dragonstone_brick_stairs.json | 80 +++++++++---------- .../blockstates/dragonstone_bricks.json | 2 +- .../blockstates/dragonstone_door.json | 64 +++++++-------- .../netherrocks/blockstates/fyrite_bars.json | 20 ++--- .../blockstates/fyrite_brick_stairs.json | 80 +++++++++---------- .../blockstates/fyrite_bricks.json | 2 +- .../netherrocks/blockstates/fyrite_door.json | 64 +++++++-------- .../blockstates/illumenite_bars.json | 20 ++--- .../blockstates/illumenite_brick_stairs.json | 80 +++++++++---------- .../blockstates/illumenite_bricks.json | 2 +- .../blockstates/illumenite_door.json | 64 +++++++-------- .../blockstates/malachite_bars.json | 20 ++--- .../blockstates/malachite_brick_stairs.json | 80 +++++++++---------- .../blockstates/malachite_bricks.json | 2 +- .../blockstates/malachite_door.json | 64 +++++++-------- .../assets/netherrocks/lang/uk_ua.json | 29 +++++++ .../models/block/argonite_bars_cap.json | 6 +- .../models/block/argonite_bars_cap_alt.json | 6 +- .../models/block/argonite_bars_post.json | 4 +- .../models/block/argonite_bars_post_ends.json | 4 +- .../models/block/argonite_bars_side.json | 6 +- .../models/block/argonite_bars_side_alt.json | 6 +- .../block/argonite_brick_inner_stairs.json | 6 +- .../block/argonite_brick_outer_stairs.json | 6 +- .../models/block/argonite_brick_stairs.json | 6 +- .../models/block/argonite_bricks.json | 2 +- .../models/block/argonite_door_bottom.json | 4 +- .../models/block/argonite_door_bottom_rh.json | 4 +- .../models/block/argonite_door_top.json | 4 +- .../models/block/argonite_door_top_rh.json | 4 +- .../models/block/ashstone_bars_cap.json | 6 +- .../models/block/ashstone_bars_cap_alt.json | 6 +- .../models/block/ashstone_bars_post.json | 4 +- .../models/block/ashstone_bars_post_ends.json | 4 +- .../models/block/ashstone_bars_side.json | 6 +- .../models/block/ashstone_bars_side_alt.json | 6 +- .../block/ashstone_brick_inner_stairs.json | 6 +- .../block/ashstone_brick_outer_stairs.json | 6 +- .../models/block/ashstone_brick_stairs.json | 6 +- .../models/block/ashstone_bricks.json | 2 +- .../models/block/ashstone_door_bottom.json | 4 +- .../models/block/ashstone_door_bottom_rh.json | 4 +- .../models/block/ashstone_door_top.json | 4 +- .../models/block/ashstone_door_top_rh.json | 4 +- .../models/block/dragonstone_bars_cap.json | 6 +- .../block/dragonstone_bars_cap_alt.json | 6 +- .../models/block/dragonstone_bars_post.json | 4 +- .../block/dragonstone_bars_post_ends.json | 4 +- .../models/block/dragonstone_bars_side.json | 6 +- .../block/dragonstone_bars_side_alt.json | 6 +- .../block/dragonstone_brick_inner_stairs.json | 6 +- .../block/dragonstone_brick_outer_stairs.json | 6 +- .../block/dragonstone_brick_stairs.json | 6 +- .../models/block/dragonstone_bricks.json | 2 +- .../models/block/dragonstone_door_bottom.json | 4 +- .../block/dragonstone_door_bottom_rh.json | 4 +- .../models/block/dragonstone_door_top.json | 4 +- .../models/block/dragonstone_door_top_rh.json | 4 +- .../models/block/fyrite_bars_cap.json | 6 +- .../models/block/fyrite_bars_cap_alt.json | 6 +- .../models/block/fyrite_bars_post.json | 4 +- .../models/block/fyrite_bars_post_ends.json | 4 +- .../models/block/fyrite_bars_side.json | 6 +- .../models/block/fyrite_bars_side_alt.json | 6 +- .../block/fyrite_brick_inner_stairs.json | 6 +- .../block/fyrite_brick_outer_stairs.json | 6 +- .../models/block/fyrite_brick_stairs.json | 6 +- .../models/block/fyrite_bricks.json | 2 +- .../models/block/fyrite_door_bottom.json | 4 +- .../models/block/fyrite_door_bottom_rh.json | 4 +- .../models/block/fyrite_door_top.json | 4 +- .../models/block/fyrite_door_top_rh.json | 4 +- .../models/block/illumenite_bars_cap.json | 6 +- .../models/block/illumenite_bars_cap_alt.json | 6 +- .../models/block/illumenite_bars_post.json | 4 +- .../block/illumenite_bars_post_ends.json | 4 +- .../models/block/illumenite_bars_side.json | 6 +- .../block/illumenite_bars_side_alt.json | 6 +- .../block/illumenite_brick_inner_stairs.json | 6 +- .../block/illumenite_brick_outer_stairs.json | 6 +- .../models/block/illumenite_brick_stairs.json | 6 +- .../models/block/illumenite_bricks.json | 2 +- .../models/block/illumenite_door_bottom.json | 4 +- .../block/illumenite_door_bottom_rh.json | 4 +- .../models/block/illumenite_door_top.json | 4 +- .../models/block/illumenite_door_top_rh.json | 4 +- .../models/block/malachite_bars_cap.json | 6 +- .../models/block/malachite_bars_cap_alt.json | 6 +- .../models/block/malachite_bars_post.json | 4 +- .../block/malachite_bars_post_ends.json | 4 +- .../models/block/malachite_bars_side.json | 6 +- .../models/block/malachite_bars_side_alt.json | 6 +- .../block/malachite_brick_inner_stairs.json | 6 +- .../block/malachite_brick_outer_stairs.json | 6 +- .../models/block/malachite_brick_stairs.json | 6 +- .../models/block/malachite_bricks.json | 2 +- .../models/block/malachite_door_bottom.json | 4 +- .../block/malachite_door_bottom_rh.json | 4 +- .../models/block/malachite_door_top.json | 4 +- .../models/block/malachite_door_top_rh.json | 4 +- .../models/item/argonite_bars.json | 2 +- .../models/item/argonite_brick_stairs.json | 2 +- .../models/item/argonite_bricks.json | 2 +- .../models/item/argonite_door.json | 2 +- .../models/item/ashstone_bars.json | 2 +- .../models/item/ashstone_brick_stairs.json | 2 +- .../models/item/ashstone_bricks.json | 2 +- .../models/item/ashstone_door.json | 2 +- .../models/item/dragonstone_bars.json | 2 +- .../models/item/dragonstone_brick_stairs.json | 2 +- .../models/item/dragonstone_bricks.json | 2 +- .../models/item/dragonstone_door.json | 2 +- .../netherrocks/models/item/fyrite_bars.json | 2 +- .../models/item/fyrite_brick_stairs.json | 2 +- .../models/item/fyrite_bricks.json | 2 +- .../netherrocks/models/item/fyrite_door.json | 2 +- .../models/item/illumenite_bars.json | 2 +- .../models/item/illumenite_brick_stairs.json | 2 +- .../models/item/illumenite_bricks.json | 2 +- .../models/item/illumenite_door.json | 2 +- .../models/item/malachite_bars.json | 2 +- .../models/item/malachite_brick_stairs.json | 2 +- .../models/item/malachite_bricks.json | 2 +- .../models/item/malachite_door.json | 2 +- 133 files changed, 755 insertions(+), 726 deletions(-) create mode 100644 src/main/resources/assets/netherrocks/lang/uk_ua.json diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_bars.json b/src/main/resources/assets/netherrocks/blockstates/argonite_bars.json index b449e12e..2eff2872 100644 --- a/src/main/resources/assets/netherrocks/blockstates/argonite_bars.json +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_bars.json @@ -1,32 +1,32 @@ { "multipart": [ - { "apply": { "model": "aesthetics:block/argonite_bars_post_ends" }}, + { "apply": { "model": "netherrocks:block/argonite_bars_post_ends" }}, { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/argonite_bars_post" } + "apply": { "model": "netherrocks:block/argonite_bars_post" } }, { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/argonite_bars_cap" } + "apply": { "model": "netherrocks:block/argonite_bars_cap" } }, { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/argonite_bars_cap", "y": 90 } + "apply": { "model": "netherrocks:block/argonite_bars_cap", "y": 90 } }, { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "aesthetics:block/argonite_bars_cap_alt" } + "apply": { "model": "netherrocks:block/argonite_bars_cap_alt" } }, { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "aesthetics:block/argonite_bars_cap_alt", "y": 90 } + "apply": { "model": "netherrocks:block/argonite_bars_cap_alt", "y": 90 } }, { "when": { "north": true }, - "apply": { "model": "aesthetics:block/argonite_bars_side" } + "apply": { "model": "netherrocks:block/argonite_bars_side" } }, { "when": { "east": true }, - "apply": { "model": "aesthetics:block/argonite_bars_side", "y": 90 } + "apply": { "model": "netherrocks:block/argonite_bars_side", "y": 90 } }, { "when": { "south": true }, - "apply": { "model": "aesthetics:block/argonite_bars_side_alt" } + "apply": { "model": "netherrocks:block/argonite_bars_side_alt" } }, { "when": { "west": true }, - "apply": { "model": "aesthetics:block/argonite_bars_side_alt", "y": 90 } + "apply": { "model": "netherrocks:block/argonite_bars_side_alt", "y": 90 } } ] } diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/argonite_brick_stairs.json index 514e35b5..29a90af6 100644 --- a/src/main/resources/assets/netherrocks/blockstates/argonite_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_brick_stairs.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "aesthetics:block/argonite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "aesthetics:block/argonite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "aesthetics:block/argonite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_bricks.json b/src/main/resources/assets/netherrocks/blockstates/argonite_bricks.json index 1ca72e1c..56795aeb 100644 --- a/src/main/resources/assets/netherrocks/blockstates/argonite_bricks.json +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_bricks.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "aesthetics:block/argonite_bricks" } + "": { "model": "netherrocks:block/argonite_bricks" } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_door.json b/src/main/resources/assets/netherrocks/blockstates/argonite_door.json index 35dd95a0..66a31395 100644 --- a/src/main/resources/assets/netherrocks/blockstates/argonite_door.json +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_door.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "aesthetics:block/argonite_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "aesthetics:block/argonite_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "aesthetics:block/argonite_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "aesthetics:block/argonite_door_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_top", "y": 180 } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_bars.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_bars.json index a965fac5..33369915 100644 --- a/src/main/resources/assets/netherrocks/blockstates/ashstone_bars.json +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_bars.json @@ -1,32 +1,32 @@ { "multipart": [ - { "apply": { "model": "aesthetics:block/ashstone_bars_post_ends" }}, + { "apply": { "model": "netherrocks:block/ashstone_bars_post_ends" }}, { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/ashstone_bars_post" } + "apply": { "model": "netherrocks:block/ashstone_bars_post" } }, { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/ashstone_bars_cap" } + "apply": { "model": "netherrocks:block/ashstone_bars_cap" } }, { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/ashstone_bars_cap", "y": 90 } + "apply": { "model": "netherrocks:block/ashstone_bars_cap", "y": 90 } }, { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "aesthetics:block/ashstone_bars_cap_alt" } + "apply": { "model": "netherrocks:block/ashstone_bars_cap_alt" } }, { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "aesthetics:block/ashstone_bars_cap_alt", "y": 90 } + "apply": { "model": "netherrocks:block/ashstone_bars_cap_alt", "y": 90 } }, { "when": { "north": true }, - "apply": { "model": "aesthetics:block/ashstone_bars_side" } + "apply": { "model": "netherrocks:block/ashstone_bars_side" } }, { "when": { "east": true }, - "apply": { "model": "aesthetics:block/ashstone_bars_side", "y": 90 } + "apply": { "model": "netherrocks:block/ashstone_bars_side", "y": 90 } }, { "when": { "south": true }, - "apply": { "model": "aesthetics:block/ashstone_bars_side_alt" } + "apply": { "model": "netherrocks:block/ashstone_bars_side_alt" } }, { "when": { "west": true }, - "apply": { "model": "aesthetics:block/ashstone_bars_side_alt", "y": 90 } + "apply": { "model": "netherrocks:block/ashstone_bars_side_alt", "y": 90 } } ] } diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_stairs.json index c525b0b6..30ffd7f8 100644 --- a/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_stairs.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "aesthetics:block/ashstone_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "aesthetics:block/ashstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "aesthetics:block/ashstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_bricks.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_bricks.json index 55a7d042..df31103f 100644 --- a/src/main/resources/assets/netherrocks/blockstates/ashstone_bricks.json +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_bricks.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "aesthetics:block/ashstone_bricks" } + "": { "model": "netherrocks:block/ashstone_bricks" } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_door.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_door.json index f8742abc..76fb9929 100644 --- a/src/main/resources/assets/netherrocks/blockstates/ashstone_door.json +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_door.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "aesthetics:block/ashstone_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "aesthetics:block/ashstone_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "aesthetics:block/ashstone_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "aesthetics:block/ashstone_door_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_top", "y": 180 } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_bars.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_bars.json index d0dc813b..962656fd 100644 --- a/src/main/resources/assets/netherrocks/blockstates/dragonstone_bars.json +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_bars.json @@ -1,32 +1,32 @@ { "multipart": [ - { "apply": { "model": "aesthetics:block/dragonstone_bars_post_ends" }}, + { "apply": { "model": "netherrocks:block/dragonstone_bars_post_ends" }}, { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/dragonstone_bars_post" } + "apply": { "model": "netherrocks:block/dragonstone_bars_post" } }, { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/dragonstone_bars_cap" } + "apply": { "model": "netherrocks:block/dragonstone_bars_cap" } }, { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/dragonstone_bars_cap", "y": 90 } + "apply": { "model": "netherrocks:block/dragonstone_bars_cap", "y": 90 } }, { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "aesthetics:block/dragonstone_bars_cap_alt" } + "apply": { "model": "netherrocks:block/dragonstone_bars_cap_alt" } }, { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "aesthetics:block/dragonstone_bars_cap_alt", "y": 90 } + "apply": { "model": "netherrocks:block/dragonstone_bars_cap_alt", "y": 90 } }, { "when": { "north": true }, - "apply": { "model": "aesthetics:block/dragonstone_bars_side" } + "apply": { "model": "netherrocks:block/dragonstone_bars_side" } }, { "when": { "east": true }, - "apply": { "model": "aesthetics:block/dragonstone_bars_side", "y": 90 } + "apply": { "model": "netherrocks:block/dragonstone_bars_side", "y": 90 } }, { "when": { "south": true }, - "apply": { "model": "aesthetics:block/dragonstone_bars_side_alt" } + "apply": { "model": "netherrocks:block/dragonstone_bars_side_alt" } }, { "when": { "west": true }, - "apply": { "model": "aesthetics:block/dragonstone_bars_side_alt", "y": 90 } + "apply": { "model": "netherrocks:block/dragonstone_bars_side_alt", "y": 90 } } ] } diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_stairs.json index dc25ca6f..11486c7e 100644 --- a/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_stairs.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "aesthetics:block/dragonstone_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "aesthetics:block/dragonstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "aesthetics:block/dragonstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_bricks.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_bricks.json index 90a3b75a..4bafa4f6 100644 --- a/src/main/resources/assets/netherrocks/blockstates/dragonstone_bricks.json +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_bricks.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "aesthetics:block/dragonstone_bricks" } + "": { "model": "netherrocks:block/dragonstone_bricks" } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_door.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_door.json index 20f7d8d9..f2d6d31b 100644 --- a/src/main/resources/assets/netherrocks/blockstates/dragonstone_door.json +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_door.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "aesthetics:block/dragonstone_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "aesthetics:block/dragonstone_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "aesthetics:block/dragonstone_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "aesthetics:block/dragonstone_door_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_top", "y": 180 } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_bars.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_bars.json index 16d45cba..bfc5db24 100644 --- a/src/main/resources/assets/netherrocks/blockstates/fyrite_bars.json +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_bars.json @@ -1,32 +1,32 @@ { "multipart": [ - { "apply": { "model": "aesthetics:block/fyrite_bars_post_ends" }}, + { "apply": { "model": "netherrocks:block/fyrite_bars_post_ends" }}, { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/fyrite_bars_post" } + "apply": { "model": "netherrocks:block/fyrite_bars_post" } }, { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/fyrite_bars_cap" } + "apply": { "model": "netherrocks:block/fyrite_bars_cap" } }, { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/fyrite_bars_cap", "y": 90 } + "apply": { "model": "netherrocks:block/fyrite_bars_cap", "y": 90 } }, { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "aesthetics:block/fyrite_bars_cap_alt" } + "apply": { "model": "netherrocks:block/fyrite_bars_cap_alt" } }, { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "aesthetics:block/fyrite_bars_cap_alt", "y": 90 } + "apply": { "model": "netherrocks:block/fyrite_bars_cap_alt", "y": 90 } }, { "when": { "north": true }, - "apply": { "model": "aesthetics:block/fyrite_bars_side" } + "apply": { "model": "netherrocks:block/fyrite_bars_side" } }, { "when": { "east": true }, - "apply": { "model": "aesthetics:block/fyrite_bars_side", "y": 90 } + "apply": { "model": "netherrocks:block/fyrite_bars_side", "y": 90 } }, { "when": { "south": true }, - "apply": { "model": "aesthetics:block/fyrite_bars_side_alt" } + "apply": { "model": "netherrocks:block/fyrite_bars_side_alt" } }, { "when": { "west": true }, - "apply": { "model": "aesthetics:block/fyrite_bars_side_alt", "y": 90 } + "apply": { "model": "netherrocks:block/fyrite_bars_side_alt", "y": 90 } } ] } diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_stairs.json index 57f745a8..00e52b51 100644 --- a/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_stairs.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "aesthetics:block/fyrite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "aesthetics:block/fyrite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "aesthetics:block/fyrite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_bricks.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_bricks.json index 78b30ac8..0d2573dc 100644 --- a/src/main/resources/assets/netherrocks/blockstates/fyrite_bricks.json +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_bricks.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "aesthetics:block/fyrite_bricks" } + "": { "model": "netherrocks:block/fyrite_bricks" } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_door.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_door.json index 5c9d60f9..7ec3ef3f 100644 --- a/src/main/resources/assets/netherrocks/blockstates/fyrite_door.json +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_door.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "aesthetics:block/fyrite_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "aesthetics:block/fyrite_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "aesthetics:block/fyrite_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "aesthetics:block/fyrite_door_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_top", "y": 180 } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_bars.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_bars.json index bc7e9888..bcc20b37 100644 --- a/src/main/resources/assets/netherrocks/blockstates/illumenite_bars.json +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_bars.json @@ -1,32 +1,32 @@ { "multipart": [ - { "apply": { "model": "aesthetics:block/illumenite_bars_post_ends" }}, + { "apply": { "model": "netherrocks:block/illumenite_bars_post_ends" }}, { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/illumenite_bars_post" } + "apply": { "model": "netherrocks:block/illumenite_bars_post" } }, { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/illumenite_bars_cap" } + "apply": { "model": "netherrocks:block/illumenite_bars_cap" } }, { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/illumenite_bars_cap", "y": 90 } + "apply": { "model": "netherrocks:block/illumenite_bars_cap", "y": 90 } }, { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "aesthetics:block/illumenite_bars_cap_alt" } + "apply": { "model": "netherrocks:block/illumenite_bars_cap_alt" } }, { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "aesthetics:block/illumenite_bars_cap_alt", "y": 90 } + "apply": { "model": "netherrocks:block/illumenite_bars_cap_alt", "y": 90 } }, { "when": { "north": true }, - "apply": { "model": "aesthetics:block/illumenite_bars_side" } + "apply": { "model": "netherrocks:block/illumenite_bars_side" } }, { "when": { "east": true }, - "apply": { "model": "aesthetics:block/illumenite_bars_side", "y": 90 } + "apply": { "model": "netherrocks:block/illumenite_bars_side", "y": 90 } }, { "when": { "south": true }, - "apply": { "model": "aesthetics:block/illumenite_bars_side_alt" } + "apply": { "model": "netherrocks:block/illumenite_bars_side_alt" } }, { "when": { "west": true }, - "apply": { "model": "aesthetics:block/illumenite_bars_side_alt", "y": 90 } + "apply": { "model": "netherrocks:block/illumenite_bars_side_alt", "y": 90 } } ] } diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_stairs.json index 448b5b09..d3e1d622 100644 --- a/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_stairs.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "aesthetics:block/illumenite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "aesthetics:block/illumenite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "aesthetics:block/illumenite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_bricks.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_bricks.json index aa51d807..31e6827a 100644 --- a/src/main/resources/assets/netherrocks/blockstates/illumenite_bricks.json +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_bricks.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "aesthetics:block/illumenite_bricks" } + "": { "model": "netherrocks:block/illumenite_bricks" } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_door.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_door.json index 5d8419e6..33c46f95 100644 --- a/src/main/resources/assets/netherrocks/blockstates/illumenite_door.json +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_door.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "aesthetics:block/illumenite_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "aesthetics:block/illumenite_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "aesthetics:block/illumenite_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "aesthetics:block/illumenite_door_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_top", "y": 180 } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_bars.json b/src/main/resources/assets/netherrocks/blockstates/malachite_bars.json index 4042f1a2..524c19e3 100644 --- a/src/main/resources/assets/netherrocks/blockstates/malachite_bars.json +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_bars.json @@ -1,32 +1,32 @@ { "multipart": [ - { "apply": { "model": "aesthetics:block/malachite_bars_post_ends" }}, + { "apply": { "model": "netherrocks:block/malachite_bars_post_ends" }}, { "when": { "north": false, "east": false, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/malachite_bars_post" } + "apply": { "model": "netherrocks:block/malachite_bars_post" } }, { "when": { "north": true, "east": false, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/malachite_bars_cap" } + "apply": { "model": "netherrocks:block/malachite_bars_cap" } }, { "when": { "north": false, "east": true, "south": false, "west": false }, - "apply": { "model": "aesthetics:block/malachite_bars_cap", "y": 90 } + "apply": { "model": "netherrocks:block/malachite_bars_cap", "y": 90 } }, { "when": { "north": false, "east": false, "south": true, "west": false }, - "apply": { "model": "aesthetics:block/malachite_bars_cap_alt" } + "apply": { "model": "netherrocks:block/malachite_bars_cap_alt" } }, { "when": { "north": false, "east": false, "south": false, "west": true }, - "apply": { "model": "aesthetics:block/malachite_bars_cap_alt", "y": 90 } + "apply": { "model": "netherrocks:block/malachite_bars_cap_alt", "y": 90 } }, { "when": { "north": true }, - "apply": { "model": "aesthetics:block/malachite_bars_side" } + "apply": { "model": "netherrocks:block/malachite_bars_side" } }, { "when": { "east": true }, - "apply": { "model": "aesthetics:block/malachite_bars_side", "y": 90 } + "apply": { "model": "netherrocks:block/malachite_bars_side", "y": 90 } }, { "when": { "south": true }, - "apply": { "model": "aesthetics:block/malachite_bars_side_alt" } + "apply": { "model": "netherrocks:block/malachite_bars_side_alt" } }, { "when": { "west": true }, - "apply": { "model": "aesthetics:block/malachite_bars_side_alt", "y": 90 } + "apply": { "model": "netherrocks:block/malachite_bars_side_alt", "y": 90 } } ] } diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/malachite_brick_stairs.json index ff944c6b..a266ccfb 100644 --- a/src/main/resources/assets/netherrocks/blockstates/malachite_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_brick_stairs.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "aesthetics:block/malachite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "aesthetics:block/malachite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "aesthetics:block/malachite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_bricks.json b/src/main/resources/assets/netherrocks/blockstates/malachite_bricks.json index e47ae509..2518a75c 100644 --- a/src/main/resources/assets/netherrocks/blockstates/malachite_bricks.json +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_bricks.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "aesthetics:block/malachite_bricks" } + "": { "model": "netherrocks:block/malachite_bricks" } } } diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_door.json b/src/main/resources/assets/netherrocks/blockstates/malachite_door.json index ab52f2b5..34b512d4 100644 --- a/src/main/resources/assets/netherrocks/blockstates/malachite_door.json +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_door.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "aesthetics:block/malachite_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "aesthetics:block/malachite_door_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "aesthetics:block/malachite_door_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "aesthetics:block/malachite_door_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_top", "y": 180 } } } diff --git a/src/main/resources/assets/netherrocks/lang/uk_ua.json b/src/main/resources/assets/netherrocks/lang/uk_ua.json new file mode 100644 index 00000000..6f066354 --- /dev/null +++ b/src/main/resources/assets/netherrocks/lang/uk_ua.json @@ -0,0 +1,29 @@ +{ + "block.netherrocks.fyrite_bricks": "Фейритова цегла Bricks", + "block.netherrocks.malachite_bricks": "Малахітова цегла", + "block.netherrocks.ashstone_bricks": "Вулканічна цегла", + "block.netherrocks.illumenite_bricks": "Ілюменітова цегла", + "block.netherrocks.dragonstone_bricks": "Драконітова цегла", + "block.netherrocks.argonite_bricks": "Аргонітова цегла", + + "block.netherrocks.fyrite_brick_stairs": "Сходи з фейритової цегли", + "block.netherrocks.malachite_brick_stairs": "Сходи з малахітової цегли", + "block.netherrocks.ashstone_brick_stairs": "Сходи з вулканічної цегли", + "block.netherrocks.illumenite_brick_stairs": "Сходи з ілюменітової цегли", + "block.netherrocks.dragonstone_brick_stairs": "Сходи з драконіту цегли", + "block.netherrocks.argonite_brick_stairs": "Сходи з аргонітової цегли", + + "block.netherrocks.fyrite_bars": "Фейритові грати", + "block.netherrocks.malachite_bars": "Малахітові грати", + "block.netherrocks.ashstone_bars": "вулканічні грати", + "block.netherrocks.illumenite_bars": "Ілюменітові грати", + "block.netherrocks.dragonstone_bars": "Драконітові грати", + "block.netherrocks.argonite_bars": "Аргонітові грати", + + "block.netherrocks.argonite_door": "Аргонітові двері", + "block.netherrocks.ashstone_door": "вулканічні двері", + "block.netherrocks.dragonstone_door": "Драконітові двері", + "block.netherrocks.fyrite_door": "Фейрітові двері", + "block.netherrocks.illumenite_door": "Ілюменітові двері", + "block.netherrocks.malachite_door": "Малахітові двері" +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap.json index 73e00591..ef995381 100644 --- a/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap.json +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/argonite_bars", - "bars": "aesthetics:block/argonite_bars", - "edge": "aesthetics:block/argonite_bars" + "particle": "netherrocks:block/argonite_bars", + "bars": "netherrocks:block/argonite_bars", + "edge": "netherrocks:block/argonite_bars" }, "elements": [ { "from": [ 8, 0, 8 ], diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap_alt.json index 421e9907..1ce03182 100644 --- a/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap_alt.json +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap_alt.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/argonite_bars", - "bars": "aesthetics:block/argonite_bars", - "edge": "aesthetics:block/argonite_bars" + "particle": "netherrocks:block/argonite_bars", + "bars": "netherrocks:block/argonite_bars", + "edge": "netherrocks:block/argonite_bars" }, "elements": [ { "from": [ 8, 0, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_post.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_post.json index 9852c8ad..f44a175d 100644 --- a/src/main/resources/assets/netherrocks/models/block/argonite_bars_post.json +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_post.json @@ -1,8 +1,8 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/argonite_bars", - "bars": "aesthetics:block/argonite_bars" + "particle": "netherrocks:block/argonite_bars", + "bars": "netherrocks:block/argonite_bars" }, "elements": [ { "from": [ 8, 0, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_post_ends.json index 072ba742..bf1522ea 100644 --- a/src/main/resources/assets/netherrocks/models/block/argonite_bars_post_ends.json +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_post_ends.json @@ -1,8 +1,8 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/argonite_bars", - "edge": "aesthetics:block/argonite_bars" + "particle": "netherrocks:block/argonite_bars", + "edge": "netherrocks:block/argonite_bars" }, "elements": [ { "from": [ 7, 0.001, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_side.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_side.json index 3ac0cce8..76e6fa4c 100644 --- a/src/main/resources/assets/netherrocks/models/block/argonite_bars_side.json +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_side.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/argonite_bars", - "bars": "aesthetics:block/argonite_bars", - "edge": "aesthetics:block/argonite_bars" + "particle": "netherrocks:block/argonite_bars", + "bars": "netherrocks:block/argonite_bars", + "edge": "netherrocks:block/argonite_bars" }, "elements": [ { "from": [ 8, 0, 0 ], diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_side_alt.json index c0f19e95..8af53b52 100644 --- a/src/main/resources/assets/netherrocks/models/block/argonite_bars_side_alt.json +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_side_alt.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/argonite_bars", - "bars": "aesthetics:block/argonite_bars", - "edge": "aesthetics:block/argonite_bars" + "particle": "netherrocks:block/argonite_bars", + "bars": "netherrocks:block/argonite_bars", + "edge": "netherrocks:block/argonite_bars" }, "elements": [ { "from": [ 8, 0, 8 ], diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/argonite_brick_inner_stairs.json index dee36c38..0f5597a5 100644 --- a/src/main/resources/assets/netherrocks/models/block/argonite_brick_inner_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/argonite_brick_inner_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "aesthetics:block/argonite_bricks", - "top": "aesthetics:block/argonite_bricks", - "side": "aesthetics:block/argonite_bricks" + "bottom": "netherrocks:block/argonite_bricks", + "top": "netherrocks:block/argonite_bricks", + "side": "netherrocks:block/argonite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/argonite_brick_outer_stairs.json index fcb2e2db..e7b8c6ef 100644 --- a/src/main/resources/assets/netherrocks/models/block/argonite_brick_outer_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/argonite_brick_outer_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "aesthetics:block/argonite_bricks", - "top": "aesthetics:block/argonite_bricks", - "side": "aesthetics:block/argonite_bricks" + "bottom": "netherrocks:block/argonite_bricks", + "top": "netherrocks:block/argonite_bricks", + "side": "netherrocks:block/argonite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/argonite_brick_stairs.json index f30db254..9f287aaf 100644 --- a/src/main/resources/assets/netherrocks/models/block/argonite_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/argonite_brick_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "aesthetics:block/argonite_bricks", - "top": "aesthetics:block/argonite_bricks", - "side": "aesthetics:block/argonite_bricks" + "bottom": "netherrocks:block/argonite_bricks", + "top": "netherrocks:block/argonite_bricks", + "side": "netherrocks:block/argonite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bricks.json b/src/main/resources/assets/netherrocks/models/block/argonite_bricks.json index 837ed523..1522c30f 100644 --- a/src/main/resources/assets/netherrocks/models/block/argonite_bricks.json +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bricks.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "aesthetics:block/argonite_bricks" + "all": "netherrocks:block/argonite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom.json index b02cadc7..b0113887 100644 --- a/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom.json +++ b/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom.json @@ -1,7 +1,7 @@ { "parent": "block/door_bottom", "textures": { - "bottom": "aesthetics:block/argonite_door_lower", - "top": "aesthetics:block/argonite_door_upper" + "bottom": "netherrocks:block/argonite_door_lower", + "top": "netherrocks:block/argonite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom_rh.json index ed49b83f..52274aea 100644 --- a/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom_rh.json +++ b/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom_rh.json @@ -1,7 +1,7 @@ { "parent": "block/door_bottom_rh", "textures": { - "bottom": "aesthetics:block/argonite_door_lower", - "top": "aesthetics:block/argonite_door_upper" + "bottom": "netherrocks:block/argonite_door_lower", + "top": "netherrocks:block/argonite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_door_top.json b/src/main/resources/assets/netherrocks/models/block/argonite_door_top.json index 66645027..55357154 100644 --- a/src/main/resources/assets/netherrocks/models/block/argonite_door_top.json +++ b/src/main/resources/assets/netherrocks/models/block/argonite_door_top.json @@ -1,7 +1,7 @@ { "parent": "block/door_top", "textures": { - "bottom": "aesthetics:block/argonite_door_lower", - "top": "aesthetics:block/argonite_door_upper" + "bottom": "netherrocks:block/argonite_door_lower", + "top": "netherrocks:block/argonite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/argonite_door_top_rh.json index e666dd32..d30eb8d9 100644 --- a/src/main/resources/assets/netherrocks/models/block/argonite_door_top_rh.json +++ b/src/main/resources/assets/netherrocks/models/block/argonite_door_top_rh.json @@ -1,7 +1,7 @@ { "parent": "block/door_top_rh", "textures": { - "bottom": "aesthetics:block/argonite_door_lower", - "top": "aesthetics:block/argonite_door_upper" + "bottom": "netherrocks:block/argonite_door_lower", + "top": "netherrocks:block/argonite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap.json index 459416e7..896ce708 100644 --- a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap.json +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/ashstone_bars", - "bars": "aesthetics:block/ashstone_bars", - "edge": "aesthetics:block/ashstone_bars" + "particle": "netherrocks:block/ashstone_bars", + "bars": "netherrocks:block/ashstone_bars", + "edge": "netherrocks:block/ashstone_bars" }, "elements": [ { "from": [ 8, 0, 8 ], diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap_alt.json index 42ee0830..e4b42651 100644 --- a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap_alt.json +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap_alt.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/ashstone_bars", - "bars": "aesthetics:block/ashstone_bars", - "edge": "aesthetics:block/ashstone_bars" + "particle": "netherrocks:block/ashstone_bars", + "bars": "netherrocks:block/ashstone_bars", + "edge": "netherrocks:block/ashstone_bars" }, "elements": [ { "from": [ 8, 0, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post.json index a92fc4fc..2b5f36c4 100644 --- a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post.json +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post.json @@ -1,8 +1,8 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/ashstone_bars", - "bars": "aesthetics:block/ashstone_bars" + "particle": "netherrocks:block/ashstone_bars", + "bars": "netherrocks:block/ashstone_bars" }, "elements": [ { "from": [ 8, 0, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post_ends.json index 0325242d..36f8dbe7 100644 --- a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post_ends.json +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post_ends.json @@ -1,8 +1,8 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/ashstone_bars", - "edge": "aesthetics:block/ashstone_bars" + "particle": "netherrocks:block/ashstone_bars", + "edge": "netherrocks:block/ashstone_bars" }, "elements": [ { "from": [ 7, 0.001, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side.json index c413d3c1..4647fa13 100644 --- a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side.json +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/ashstone_bars", - "bars": "aesthetics:block/ashstone_bars", - "edge": "aesthetics:block/ashstone_bars" + "particle": "netherrocks:block/ashstone_bars", + "bars": "netherrocks:block/ashstone_bars", + "edge": "netherrocks:block/ashstone_bars" }, "elements": [ { "from": [ 8, 0, 0 ], diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side_alt.json index 0a528b7b..77638b89 100644 --- a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side_alt.json +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side_alt.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/ashstone_bars", - "bars": "aesthetics:block/ashstone_bars", - "edge": "aesthetics:block/ashstone_bars" + "particle": "netherrocks:block/ashstone_bars", + "bars": "netherrocks:block/ashstone_bars", + "edge": "netherrocks:block/ashstone_bars" }, "elements": [ { "from": [ 8, 0, 8 ], diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_inner_stairs.json index 8c9d081d..870a40e4 100644 --- a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_inner_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_inner_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "aesthetics:block/ashstone_bricks", - "top": "aesthetics:block/ashstone_bricks", - "side": "aesthetics:block/ashstone_bricks" + "bottom": "netherrocks:block/ashstone_bricks", + "top": "netherrocks:block/ashstone_bricks", + "side": "netherrocks:block/ashstone_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_outer_stairs.json index f6489e40..c526f719 100644 --- a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_outer_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_outer_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "aesthetics:block/ashstone_bricks", - "top": "aesthetics:block/ashstone_bricks", - "side": "aesthetics:block/ashstone_bricks" + "bottom": "netherrocks:block/ashstone_bricks", + "top": "netherrocks:block/ashstone_bricks", + "side": "netherrocks:block/ashstone_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_stairs.json index fe980b04..668c57f1 100644 --- a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "aesthetics:block/ashstone_bricks", - "top": "aesthetics:block/ashstone_bricks", - "side": "aesthetics:block/ashstone_bricks" + "bottom": "netherrocks:block/ashstone_bricks", + "top": "netherrocks:block/ashstone_bricks", + "side": "netherrocks:block/ashstone_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bricks.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bricks.json index eef4ab96..8e35254e 100644 --- a/src/main/resources/assets/netherrocks/models/block/ashstone_bricks.json +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bricks.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "aesthetics:block/ashstone_bricks" + "all": "netherrocks:block/ashstone_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom.json index 14e588aa..6b4d9d2c 100644 --- a/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom.json +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom.json @@ -1,7 +1,7 @@ { "parent": "block/door_bottom", "textures": { - "bottom": "aesthetics:block/ashstone_door_lower", - "top": "aesthetics:block/ashstone_door_upper" + "bottom": "netherrocks:block/ashstone_door_lower", + "top": "netherrocks:block/ashstone_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom_rh.json index f8fdf458..388ceeae 100644 --- a/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom_rh.json +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom_rh.json @@ -1,7 +1,7 @@ { "parent": "block/door_bottom_rh", "textures": { - "bottom": "aesthetics:block/ashstone_door_lower", - "top": "aesthetics:block/ashstone_door_upper" + "bottom": "netherrocks:block/ashstone_door_lower", + "top": "netherrocks:block/ashstone_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_door_top.json b/src/main/resources/assets/netherrocks/models/block/ashstone_door_top.json index 8b21e374..461b671e 100644 --- a/src/main/resources/assets/netherrocks/models/block/ashstone_door_top.json +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_door_top.json @@ -1,7 +1,7 @@ { "parent": "block/door_top", "textures": { - "bottom": "aesthetics:block/ashstone_door_lower", - "top": "aesthetics:block/ashstone_door_upper" + "bottom": "netherrocks:block/ashstone_door_lower", + "top": "netherrocks:block/ashstone_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/ashstone_door_top_rh.json index 3b9fed96..0c0765c2 100644 --- a/src/main/resources/assets/netherrocks/models/block/ashstone_door_top_rh.json +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_door_top_rh.json @@ -1,7 +1,7 @@ { "parent": "block/door_top_rh", "textures": { - "bottom": "aesthetics:block/ashstone_door_lower", - "top": "aesthetics:block/ashstone_door_upper" + "bottom": "netherrocks:block/ashstone_door_lower", + "top": "netherrocks:block/ashstone_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap.json index 85e11102..a952b367 100644 --- a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap.json +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/dragonstone_bars", - "bars": "aesthetics:block/dragonstone_bars", - "edge": "aesthetics:block/dragonstone_bars" + "particle": "netherrocks:block/dragonstone_bars", + "bars": "netherrocks:block/dragonstone_bars", + "edge": "netherrocks:block/dragonstone_bars" }, "elements": [ { "from": [ 8, 0, 8 ], diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap_alt.json index c502cee3..6f41dcf3 100644 --- a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap_alt.json +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap_alt.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/dragonstone_bars", - "bars": "aesthetics:block/dragonstone_bars", - "edge": "aesthetics:block/dragonstone_bars" + "particle": "netherrocks:block/dragonstone_bars", + "bars": "netherrocks:block/dragonstone_bars", + "edge": "netherrocks:block/dragonstone_bars" }, "elements": [ { "from": [ 8, 0, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post.json index 52257d32..fc7cc44d 100644 --- a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post.json +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post.json @@ -1,8 +1,8 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/dragonstone_bars", - "bars": "aesthetics:block/dragonstone_bars" + "particle": "netherrocks:block/dragonstone_bars", + "bars": "netherrocks:block/dragonstone_bars" }, "elements": [ { "from": [ 8, 0, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post_ends.json index abcaa01a..2af75471 100644 --- a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post_ends.json +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post_ends.json @@ -1,8 +1,8 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/dragonstone_bars", - "edge": "aesthetics:block/dragonstone_bars" + "particle": "netherrocks:block/dragonstone_bars", + "edge": "netherrocks:block/dragonstone_bars" }, "elements": [ { "from": [ 7, 0.001, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side.json index c23acf05..e580f936 100644 --- a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side.json +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/dragonstone_bars", - "bars": "aesthetics:block/dragonstone_bars", - "edge": "aesthetics:block/dragonstone_bars" + "particle": "netherrocks:block/dragonstone_bars", + "bars": "netherrocks:block/dragonstone_bars", + "edge": "netherrocks:block/dragonstone_bars" }, "elements": [ { "from": [ 8, 0, 0 ], diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side_alt.json index 28c0ea3d..41236801 100644 --- a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side_alt.json +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side_alt.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/dragonstone_bars", - "bars": "aesthetics:block/dragonstone_bars", - "edge": "aesthetics:block/dragonstone_bars" + "particle": "netherrocks:block/dragonstone_bars", + "bars": "netherrocks:block/dragonstone_bars", + "edge": "netherrocks:block/dragonstone_bars" }, "elements": [ { "from": [ 8, 0, 8 ], diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_inner_stairs.json index bf685b12..37c97002 100644 --- a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_inner_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_inner_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "aesthetics:block/dragonstone_bricks", - "top": "aesthetics:block/dragonstone_bricks", - "side": "aesthetics:block/dragonstone_bricks" + "bottom": "netherrocks:block/dragonstone_bricks", + "top": "netherrocks:block/dragonstone_bricks", + "side": "netherrocks:block/dragonstone_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_outer_stairs.json index f79bba56..b4f71f1d 100644 --- a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_outer_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_outer_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "aesthetics:block/dragonstone_bricks", - "top": "aesthetics:block/dragonstone_bricks", - "side": "aesthetics:block/dragonstone_bricks" + "bottom": "netherrocks:block/dragonstone_bricks", + "top": "netherrocks:block/dragonstone_bricks", + "side": "netherrocks:block/dragonstone_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_stairs.json index 44b98de7..b39a7cff 100644 --- a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "aesthetics:block/dragonstone_bricks", - "top": "aesthetics:block/dragonstone_bricks", - "side": "aesthetics:block/dragonstone_bricks" + "bottom": "netherrocks:block/dragonstone_bricks", + "top": "netherrocks:block/dragonstone_bricks", + "side": "netherrocks:block/dragonstone_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bricks.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bricks.json index 4dc0fa6d..d2a9e1e1 100644 --- a/src/main/resources/assets/netherrocks/models/block/dragonstone_bricks.json +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bricks.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "aesthetics:block/dragonstone_bricks" + "all": "netherrocks:block/dragonstone_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom.json index 7da84f26..5d4d561f 100644 --- a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom.json +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom.json @@ -1,7 +1,7 @@ { "parent": "block/door_bottom", "textures": { - "bottom": "aesthetics:block/dragonstone_door_lower", - "top": "aesthetics:block/dragonstone_door_upper" + "bottom": "netherrocks:block/dragonstone_door_lower", + "top": "netherrocks:block/dragonstone_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom_rh.json index 4f58bb69..de07cb75 100644 --- a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom_rh.json +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom_rh.json @@ -1,7 +1,7 @@ { "parent": "block/door_bottom_rh", "textures": { - "bottom": "aesthetics:block/dragonstone_door_lower", - "top": "aesthetics:block/dragonstone_door_upper" + "bottom": "netherrocks:block/dragonstone_door_lower", + "top": "netherrocks:block/dragonstone_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top.json index cc8fbfeb..89364333 100644 --- a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top.json +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top.json @@ -1,7 +1,7 @@ { "parent": "block/door_top", "textures": { - "bottom": "aesthetics:block/dragonstone_door_lower", - "top": "aesthetics:block/dragonstone_door_upper" + "bottom": "netherrocks:block/dragonstone_door_lower", + "top": "netherrocks:block/dragonstone_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top_rh.json index ee07d97f..d88c6b5e 100644 --- a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top_rh.json +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top_rh.json @@ -1,7 +1,7 @@ { "parent": "block/door_top_rh", "textures": { - "bottom": "aesthetics:block/dragonstone_door_lower", - "top": "aesthetics:block/dragonstone_door_upper" + "bottom": "netherrocks:block/dragonstone_door_lower", + "top": "netherrocks:block/dragonstone_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap.json index fd925859..b3397401 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/fyrite_bars", - "bars": "aesthetics:block/fyrite_bars", - "edge": "aesthetics:block/fyrite_bars" + "particle": "netherrocks:block/fyrite_bars", + "bars": "netherrocks:block/fyrite_bars", + "edge": "netherrocks:block/fyrite_bars" }, "elements": [ { "from": [ 8, 0, 8 ], diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap_alt.json index 23676988..fb3aedce 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap_alt.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap_alt.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/fyrite_bars", - "bars": "aesthetics:block/fyrite_bars", - "edge": "aesthetics:block/fyrite_bars" + "particle": "netherrocks:block/fyrite_bars", + "bars": "netherrocks:block/fyrite_bars", + "edge": "netherrocks:block/fyrite_bars" }, "elements": [ { "from": [ 8, 0, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post.json index 20d3e51c..6cba7974 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post.json @@ -1,8 +1,8 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/fyrite_bars", - "bars": "aesthetics:block/fyrite_bars" + "particle": "netherrocks:block/fyrite_bars", + "bars": "netherrocks:block/fyrite_bars" }, "elements": [ { "from": [ 8, 0, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post_ends.json index d3e9b17c..d9323447 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post_ends.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post_ends.json @@ -1,8 +1,8 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/fyrite_bars", - "edge": "aesthetics:block/fyrite_bars" + "particle": "netherrocks:block/fyrite_bars", + "edge": "netherrocks:block/fyrite_bars" }, "elements": [ { "from": [ 7, 0.001, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side.json index db539389..1a42788b 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/fyrite_bars", - "bars": "aesthetics:block/fyrite_bars", - "edge": "aesthetics:block/fyrite_bars" + "particle": "netherrocks:block/fyrite_bars", + "bars": "netherrocks:block/fyrite_bars", + "edge": "netherrocks:block/fyrite_bars" }, "elements": [ { "from": [ 8, 0, 0 ], diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side_alt.json index afe585ad..e04d51a8 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side_alt.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side_alt.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/fyrite_bars", - "bars": "aesthetics:block/fyrite_bars", - "edge": "aesthetics:block/fyrite_bars" + "particle": "netherrocks:block/fyrite_bars", + "bars": "netherrocks:block/fyrite_bars", + "edge": "netherrocks:block/fyrite_bars" }, "elements": [ { "from": [ 8, 0, 8 ], diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_inner_stairs.json index dfab3055..b853419b 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_inner_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_inner_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "aesthetics:block/fyrite_bricks", - "top": "aesthetics:block/fyrite_bricks", - "side": "aesthetics:block/fyrite_bricks" + "bottom": "netherrocks:block/fyrite_bricks", + "top": "netherrocks:block/fyrite_bricks", + "side": "netherrocks:block/fyrite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_outer_stairs.json index f17d90de..79409d64 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_outer_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_outer_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "aesthetics:block/fyrite_bricks", - "top": "aesthetics:block/fyrite_bricks", - "side": "aesthetics:block/fyrite_bricks" + "bottom": "netherrocks:block/fyrite_bricks", + "top": "netherrocks:block/fyrite_bricks", + "side": "netherrocks:block/fyrite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_stairs.json index 23f016df..530aa273 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "aesthetics:block/fyrite_bricks", - "top": "aesthetics:block/fyrite_bricks", - "side": "aesthetics:block/fyrite_bricks" + "bottom": "netherrocks:block/fyrite_bricks", + "top": "netherrocks:block/fyrite_bricks", + "side": "netherrocks:block/fyrite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bricks.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bricks.json index 4d90130b..23502b77 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_bricks.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bricks.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "aesthetics:block/fyrite_bricks" + "all": "netherrocks:block/fyrite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom.json index 9cd13bd2..39fd6905 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom.json @@ -1,7 +1,7 @@ { "parent": "block/door_bottom", "textures": { - "bottom": "aesthetics:block/fyrite_door_lower", - "top": "aesthetics:block/fyrite_door_upper" + "bottom": "netherrocks:block/fyrite_door_lower", + "top": "netherrocks:block/fyrite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom_rh.json index 2c943b2b..96a152d4 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom_rh.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom_rh.json @@ -1,7 +1,7 @@ { "parent": "block/door_bottom_rh", "textures": { - "bottom": "aesthetics:block/fyrite_door_lower", - "top": "aesthetics:block/fyrite_door_upper" + "bottom": "netherrocks:block/fyrite_door_lower", + "top": "netherrocks:block/fyrite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_door_top.json b/src/main/resources/assets/netherrocks/models/block/fyrite_door_top.json index fb4021d2..a8861a4c 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_door_top.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_door_top.json @@ -1,7 +1,7 @@ { "parent": "block/door_top", "textures": { - "bottom": "aesthetics:block/fyrite_door_lower", - "top": "aesthetics:block/fyrite_door_upper" + "bottom": "netherrocks:block/fyrite_door_lower", + "top": "netherrocks:block/fyrite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/fyrite_door_top_rh.json index fcf0b856..bb4ee3b0 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_door_top_rh.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_door_top_rh.json @@ -1,7 +1,7 @@ { "parent": "block/door_top_rh", "textures": { - "bottom": "aesthetics:block/fyrite_door_lower", - "top": "aesthetics:block/fyrite_door_upper" + "bottom": "netherrocks:block/fyrite_door_lower", + "top": "netherrocks:block/fyrite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap.json index 6ab44723..021eec13 100644 --- a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap.json +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/illumenite_bars", - "bars": "aesthetics:block/illumenite_bars", - "edge": "aesthetics:block/illumenite_bars" + "particle": "netherrocks:block/illumenite_bars", + "bars": "netherrocks:block/illumenite_bars", + "edge": "netherrocks:block/illumenite_bars" }, "elements": [ { "from": [ 8, 0, 8 ], diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap_alt.json index 017c18e1..2bd869a1 100644 --- a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap_alt.json +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap_alt.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/illumenite_bars", - "bars": "aesthetics:block/illumenite_bars", - "edge": "aesthetics:block/illumenite_bars" + "particle": "netherrocks:block/illumenite_bars", + "bars": "netherrocks:block/illumenite_bars", + "edge": "netherrocks:block/illumenite_bars" }, "elements": [ { "from": [ 8, 0, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post.json index d9279bb3..944abe83 100644 --- a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post.json +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post.json @@ -1,8 +1,8 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/illumenite_bars", - "bars": "aesthetics:block/illumenite_bars" + "particle": "netherrocks:block/illumenite_bars", + "bars": "netherrocks:block/illumenite_bars" }, "elements": [ { "from": [ 8, 0, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post_ends.json index 8039434b..ed27b7e1 100644 --- a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post_ends.json +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post_ends.json @@ -1,8 +1,8 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/illumenite_bars", - "edge": "aesthetics:block/illumenite_bars" + "particle": "netherrocks:block/illumenite_bars", + "edge": "netherrocks:block/illumenite_bars" }, "elements": [ { "from": [ 7, 0.001, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side.json index 3aacce10..cefcc1be 100644 --- a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side.json +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/illumenite_bars", - "bars": "aesthetics:block/illumenite_bars", - "edge": "aesthetics:block/illumenite_bars" + "particle": "netherrocks:block/illumenite_bars", + "bars": "netherrocks:block/illumenite_bars", + "edge": "netherrocks:block/illumenite_bars" }, "elements": [ { "from": [ 8, 0, 0 ], diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side_alt.json index 9e4d9c71..c90a0d4e 100644 --- a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side_alt.json +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side_alt.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/illumenite_bars", - "bars": "aesthetics:block/illumenite_bars", - "edge": "aesthetics:block/illumenite_bars" + "particle": "netherrocks:block/illumenite_bars", + "bars": "netherrocks:block/illumenite_bars", + "edge": "netherrocks:block/illumenite_bars" }, "elements": [ { "from": [ 8, 0, 8 ], diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_inner_stairs.json index f1cae384..07936212 100644 --- a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_inner_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_inner_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "aesthetics:block/illumenite_bricks", - "top": "aesthetics:block/illumenite_bricks", - "side": "aesthetics:block/illumenite_bricks" + "bottom": "netherrocks:block/illumenite_bricks", + "top": "netherrocks:block/illumenite_bricks", + "side": "netherrocks:block/illumenite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_outer_stairs.json index d0625823..8d3eebfe 100644 --- a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_outer_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_outer_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "aesthetics:block/illumenite_bricks", - "top": "aesthetics:block/illumenite_bricks", - "side": "aesthetics:block/illumenite_bricks" + "bottom": "netherrocks:block/illumenite_bricks", + "top": "netherrocks:block/illumenite_bricks", + "side": "netherrocks:block/illumenite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_stairs.json index a1d165bf..6e1cb975 100644 --- a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "aesthetics:block/illumenite_bricks", - "top": "aesthetics:block/illumenite_bricks", - "side": "aesthetics:block/illumenite_bricks" + "bottom": "netherrocks:block/illumenite_bricks", + "top": "netherrocks:block/illumenite_bricks", + "side": "netherrocks:block/illumenite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bricks.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bricks.json index d235cb12..6af9527b 100644 --- a/src/main/resources/assets/netherrocks/models/block/illumenite_bricks.json +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bricks.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "aesthetics:block/illumenite_bricks" + "all": "netherrocks:block/illumenite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom.json index ae9e2c54..0a0c5748 100644 --- a/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom.json +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom.json @@ -1,7 +1,7 @@ { "parent": "block/door_bottom", "textures": { - "bottom": "aesthetics:block/illumenite_door_lower", - "top": "aesthetics:block/illumenite_door_upper" + "bottom": "netherrocks:block/illumenite_door_lower", + "top": "netherrocks:block/illumenite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom_rh.json index e87b3c1b..e9493040 100644 --- a/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom_rh.json +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom_rh.json @@ -1,7 +1,7 @@ { "parent": "block/door_bottom_rh", "textures": { - "bottom": "aesthetics:block/illumenite_door_lower", - "top": "aesthetics:block/illumenite_door_upper" + "bottom": "netherrocks:block/illumenite_door_lower", + "top": "netherrocks:block/illumenite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_door_top.json b/src/main/resources/assets/netherrocks/models/block/illumenite_door_top.json index 70979d43..7ded17dc 100644 --- a/src/main/resources/assets/netherrocks/models/block/illumenite_door_top.json +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_door_top.json @@ -1,7 +1,7 @@ { "parent": "block/door_top", "textures": { - "bottom": "aesthetics:block/illumenite_door_lower", - "top": "aesthetics:block/illumenite_door_upper" + "bottom": "netherrocks:block/illumenite_door_lower", + "top": "netherrocks:block/illumenite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/illumenite_door_top_rh.json index 9f2bde7d..31e1a45d 100644 --- a/src/main/resources/assets/netherrocks/models/block/illumenite_door_top_rh.json +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_door_top_rh.json @@ -1,7 +1,7 @@ { "parent": "block/door_top_rh", "textures": { - "bottom": "aesthetics:block/illumenite_door_lower", - "top": "aesthetics:block/illumenite_door_upper" + "bottom": "netherrocks:block/illumenite_door_lower", + "top": "netherrocks:block/illumenite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap.json index 60d9c779..b3fdaf43 100644 --- a/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap.json +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/malachite_bars", - "bars": "aesthetics:block/malachite_bars", - "edge": "aesthetics:block/malachite_bars" + "particle": "netherrocks:block/malachite_bars", + "bars": "netherrocks:block/malachite_bars", + "edge": "netherrocks:block/malachite_bars" }, "elements": [ { "from": [ 8, 0, 8 ], diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap_alt.json index c4ba3d0d..09a7d7a8 100644 --- a/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap_alt.json +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap_alt.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/malachite_bars", - "bars": "aesthetics:block/malachite_bars", - "edge": "aesthetics:block/malachite_bars" + "particle": "netherrocks:block/malachite_bars", + "bars": "netherrocks:block/malachite_bars", + "edge": "netherrocks:block/malachite_bars" }, "elements": [ { "from": [ 8, 0, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_post.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_post.json index 16e9e53a..c40401c1 100644 --- a/src/main/resources/assets/netherrocks/models/block/malachite_bars_post.json +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_post.json @@ -1,8 +1,8 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/malachite_bars", - "bars": "aesthetics:block/malachite_bars" + "particle": "netherrocks:block/malachite_bars", + "bars": "netherrocks:block/malachite_bars" }, "elements": [ { "from": [ 8, 0, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_post_ends.json index 5cd2f8f1..fe60cb32 100644 --- a/src/main/resources/assets/netherrocks/models/block/malachite_bars_post_ends.json +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_post_ends.json @@ -1,8 +1,8 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/malachite_bars", - "edge": "aesthetics:block/malachite_bars" + "particle": "netherrocks:block/malachite_bars", + "edge": "netherrocks:block/malachite_bars" }, "elements": [ { "from": [ 7, 0.001, 7 ], diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_side.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_side.json index 3e5725fb..02710159 100644 --- a/src/main/resources/assets/netherrocks/models/block/malachite_bars_side.json +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_side.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/malachite_bars", - "bars": "aesthetics:block/malachite_bars", - "edge": "aesthetics:block/malachite_bars" + "particle": "netherrocks:block/malachite_bars", + "bars": "netherrocks:block/malachite_bars", + "edge": "netherrocks:block/malachite_bars" }, "elements": [ { "from": [ 8, 0, 0 ], diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_side_alt.json index c407ac03..c6f32124 100644 --- a/src/main/resources/assets/netherrocks/models/block/malachite_bars_side_alt.json +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_side_alt.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "aesthetics:block/malachite_bars", - "bars": "aesthetics:block/malachite_bars", - "edge": "aesthetics:block/malachite_bars" + "particle": "netherrocks:block/malachite_bars", + "bars": "netherrocks:block/malachite_bars", + "edge": "netherrocks:block/malachite_bars" }, "elements": [ { "from": [ 8, 0, 8 ], diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/malachite_brick_inner_stairs.json index 87fea06d..54257844 100644 --- a/src/main/resources/assets/netherrocks/models/block/malachite_brick_inner_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/malachite_brick_inner_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "aesthetics:block/malachite_bricks", - "top": "aesthetics:block/malachite_bricks", - "side": "aesthetics:block/malachite_bricks" + "bottom": "netherrocks:block/malachite_bricks", + "top": "netherrocks:block/malachite_bricks", + "side": "netherrocks:block/malachite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/malachite_brick_outer_stairs.json index 8d8e138b..325d1563 100644 --- a/src/main/resources/assets/netherrocks/models/block/malachite_brick_outer_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/malachite_brick_outer_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "aesthetics:block/malachite_bricks", - "top": "aesthetics:block/malachite_bricks", - "side": "aesthetics:block/malachite_bricks" + "bottom": "netherrocks:block/malachite_bricks", + "top": "netherrocks:block/malachite_bricks", + "side": "netherrocks:block/malachite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/malachite_brick_stairs.json index 2dcb586d..60fbfc80 100644 --- a/src/main/resources/assets/netherrocks/models/block/malachite_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/models/block/malachite_brick_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "aesthetics:block/malachite_bricks", - "top": "aesthetics:block/malachite_bricks", - "side": "aesthetics:block/malachite_bricks" + "bottom": "netherrocks:block/malachite_bricks", + "top": "netherrocks:block/malachite_bricks", + "side": "netherrocks:block/malachite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bricks.json b/src/main/resources/assets/netherrocks/models/block/malachite_bricks.json index c947bfca..7f69a421 100644 --- a/src/main/resources/assets/netherrocks/models/block/malachite_bricks.json +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bricks.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "aesthetics:block/malachite_bricks" + "all": "netherrocks:block/malachite_bricks" } } diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom.json index bea3dce3..f0da8927 100644 --- a/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom.json +++ b/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom.json @@ -1,7 +1,7 @@ { "parent": "block/door_bottom", "textures": { - "bottom": "aesthetics:block/malachite_door_lower", - "top": "aesthetics:block/malachite_door_upper" + "bottom": "netherrocks:block/malachite_door_lower", + "top": "netherrocks:block/malachite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom_rh.json index 1c8655c6..aae4557d 100644 --- a/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom_rh.json +++ b/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom_rh.json @@ -1,7 +1,7 @@ { "parent": "block/door_bottom_rh", "textures": { - "bottom": "aesthetics:block/malachite_door_lower", - "top": "aesthetics:block/malachite_door_upper" + "bottom": "netherrocks:block/malachite_door_lower", + "top": "netherrocks:block/malachite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_door_top.json b/src/main/resources/assets/netherrocks/models/block/malachite_door_top.json index 4ee310c5..66e3f5f8 100644 --- a/src/main/resources/assets/netherrocks/models/block/malachite_door_top.json +++ b/src/main/resources/assets/netherrocks/models/block/malachite_door_top.json @@ -1,7 +1,7 @@ { "parent": "block/door_top", "textures": { - "bottom": "aesthetics:block/malachite_door_lower", - "top": "aesthetics:block/malachite_door_upper" + "bottom": "netherrocks:block/malachite_door_lower", + "top": "netherrocks:block/malachite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/malachite_door_top_rh.json index 8348ef19..6ed198a3 100644 --- a/src/main/resources/assets/netherrocks/models/block/malachite_door_top_rh.json +++ b/src/main/resources/assets/netherrocks/models/block/malachite_door_top_rh.json @@ -1,7 +1,7 @@ { "parent": "block/door_top_rh", "textures": { - "bottom": "aesthetics:block/malachite_door_lower", - "top": "aesthetics:block/malachite_door_upper" + "bottom": "netherrocks:block/malachite_door_lower", + "top": "netherrocks:block/malachite_door_upper" } } diff --git a/src/main/resources/assets/netherrocks/models/item/argonite_bars.json b/src/main/resources/assets/netherrocks/models/item/argonite_bars.json index b34feda7..d64d518a 100644 --- a/src/main/resources/assets/netherrocks/models/item/argonite_bars.json +++ b/src/main/resources/assets/netherrocks/models/item/argonite_bars.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "aesthetics:block/argonite_bars" + "layer0": "netherrocks:block/argonite_bars" } } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/argonite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/argonite_brick_stairs.json index b129e535..889c6bed 100644 --- a/src/main/resources/assets/netherrocks/models/item/argonite_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/models/item/argonite_brick_stairs.json @@ -1,3 +1,3 @@ { - "parent": "aesthetics:block/argonite_brick_stairs" + "parent": "netherrocks:block/argonite_brick_stairs" } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/argonite_bricks.json b/src/main/resources/assets/netherrocks/models/item/argonite_bricks.json index 1dab0ba8..a98432e9 100644 --- a/src/main/resources/assets/netherrocks/models/item/argonite_bricks.json +++ b/src/main/resources/assets/netherrocks/models/item/argonite_bricks.json @@ -1,3 +1,3 @@ { - "parent": "aesthetics:block/argonite_bricks" + "parent": "netherrocks:block/argonite_bricks" } diff --git a/src/main/resources/assets/netherrocks/models/item/argonite_door.json b/src/main/resources/assets/netherrocks/models/item/argonite_door.json index 79af218f..a2b66111 100644 --- a/src/main/resources/assets/netherrocks/models/item/argonite_door.json +++ b/src/main/resources/assets/netherrocks/models/item/argonite_door.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "aesthetics:item/argonite_door" + "layer0": "netherrocks:item/argonite_door" } } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/ashstone_bars.json b/src/main/resources/assets/netherrocks/models/item/ashstone_bars.json index 7608f806..dcdbe977 100644 --- a/src/main/resources/assets/netherrocks/models/item/ashstone_bars.json +++ b/src/main/resources/assets/netherrocks/models/item/ashstone_bars.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "aesthetics:block/ashstone_bars" + "layer0": "netherrocks:block/ashstone_bars" } } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/ashstone_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/ashstone_brick_stairs.json index 69e4b2d3..6c9386d9 100644 --- a/src/main/resources/assets/netherrocks/models/item/ashstone_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/models/item/ashstone_brick_stairs.json @@ -1,3 +1,3 @@ { - "parent": "aesthetics:block/ashstone_brick_stairs" + "parent": "netherrocks:block/ashstone_brick_stairs" } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/ashstone_bricks.json b/src/main/resources/assets/netherrocks/models/item/ashstone_bricks.json index 96b88bd0..08252096 100644 --- a/src/main/resources/assets/netherrocks/models/item/ashstone_bricks.json +++ b/src/main/resources/assets/netherrocks/models/item/ashstone_bricks.json @@ -1,3 +1,3 @@ { - "parent": "aesthetics:block/ashstone_bricks" + "parent": "netherrocks:block/ashstone_bricks" } diff --git a/src/main/resources/assets/netherrocks/models/item/ashstone_door.json b/src/main/resources/assets/netherrocks/models/item/ashstone_door.json index 15d0a0ed..33db5c02 100644 --- a/src/main/resources/assets/netherrocks/models/item/ashstone_door.json +++ b/src/main/resources/assets/netherrocks/models/item/ashstone_door.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "aesthetics:item/ashstone_door" + "layer0": "netherrocks:item/ashstone_door" } } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/dragonstone_bars.json b/src/main/resources/assets/netherrocks/models/item/dragonstone_bars.json index 8745707f..10d8db00 100644 --- a/src/main/resources/assets/netherrocks/models/item/dragonstone_bars.json +++ b/src/main/resources/assets/netherrocks/models/item/dragonstone_bars.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "aesthetics:block/dragonstone_bars" + "layer0": "netherrocks:block/dragonstone_bars" } } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_stairs.json index d851c66c..4490a1ed 100644 --- a/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_stairs.json @@ -1,3 +1,3 @@ { - "parent": "aesthetics:block/dragonstone_brick_stairs" + "parent": "netherrocks:block/dragonstone_brick_stairs" } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/dragonstone_bricks.json b/src/main/resources/assets/netherrocks/models/item/dragonstone_bricks.json index fa4a7010..9b15d9dc 100644 --- a/src/main/resources/assets/netherrocks/models/item/dragonstone_bricks.json +++ b/src/main/resources/assets/netherrocks/models/item/dragonstone_bricks.json @@ -1,3 +1,3 @@ { - "parent": "aesthetics:block/dragonstone_bricks" + "parent": "netherrocks:block/dragonstone_bricks" } diff --git a/src/main/resources/assets/netherrocks/models/item/dragonstone_door.json b/src/main/resources/assets/netherrocks/models/item/dragonstone_door.json index 6e0eee7e..d7bff3de 100644 --- a/src/main/resources/assets/netherrocks/models/item/dragonstone_door.json +++ b/src/main/resources/assets/netherrocks/models/item/dragonstone_door.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "aesthetics:item/dragonstone_door" + "layer0": "netherrocks:item/dragonstone_door" } } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/fyrite_bars.json b/src/main/resources/assets/netherrocks/models/item/fyrite_bars.json index 6fa9815a..23ab0d21 100644 --- a/src/main/resources/assets/netherrocks/models/item/fyrite_bars.json +++ b/src/main/resources/assets/netherrocks/models/item/fyrite_bars.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "aesthetics:block/fyrite_bars" + "layer0": "netherrocks:block/fyrite_bars" } } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/fyrite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/fyrite_brick_stairs.json index f15f7fdd..44ebb358 100644 --- a/src/main/resources/assets/netherrocks/models/item/fyrite_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/models/item/fyrite_brick_stairs.json @@ -1,3 +1,3 @@ { - "parent": "aesthetics:block/fyrite_brick_stairs" + "parent": "netherrocks:block/fyrite_brick_stairs" } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/fyrite_bricks.json b/src/main/resources/assets/netherrocks/models/item/fyrite_bricks.json index d8596f13..a7596395 100644 --- a/src/main/resources/assets/netherrocks/models/item/fyrite_bricks.json +++ b/src/main/resources/assets/netherrocks/models/item/fyrite_bricks.json @@ -1,3 +1,3 @@ { - "parent": "aesthetics:block/fyrite_bricks" + "parent": "netherrocks:block/fyrite_bricks" } diff --git a/src/main/resources/assets/netherrocks/models/item/fyrite_door.json b/src/main/resources/assets/netherrocks/models/item/fyrite_door.json index b30a48c6..9977c8c9 100644 --- a/src/main/resources/assets/netherrocks/models/item/fyrite_door.json +++ b/src/main/resources/assets/netherrocks/models/item/fyrite_door.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "aesthetics:item/fyrite_door" + "layer0": "netherrocks:item/fyrite_door" } } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/illumenite_bars.json b/src/main/resources/assets/netherrocks/models/item/illumenite_bars.json index 0ae57cc8..e9e93f46 100644 --- a/src/main/resources/assets/netherrocks/models/item/illumenite_bars.json +++ b/src/main/resources/assets/netherrocks/models/item/illumenite_bars.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "aesthetics:block/illumenite_bars" + "layer0": "netherrocks:block/illumenite_bars" } } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/illumenite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/illumenite_brick_stairs.json index 5fbf89b2..4c418530 100644 --- a/src/main/resources/assets/netherrocks/models/item/illumenite_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/models/item/illumenite_brick_stairs.json @@ -1,3 +1,3 @@ { - "parent": "aesthetics:block/illumenite_brick_stairs" + "parent": "netherrocks:block/illumenite_brick_stairs" } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/illumenite_bricks.json b/src/main/resources/assets/netherrocks/models/item/illumenite_bricks.json index b1cd36c4..c5194c8e 100644 --- a/src/main/resources/assets/netherrocks/models/item/illumenite_bricks.json +++ b/src/main/resources/assets/netherrocks/models/item/illumenite_bricks.json @@ -1,3 +1,3 @@ { - "parent": "aesthetics:block/illumenite_bricks" + "parent": "netherrocks:block/illumenite_bricks" } diff --git a/src/main/resources/assets/netherrocks/models/item/illumenite_door.json b/src/main/resources/assets/netherrocks/models/item/illumenite_door.json index 8595e9b9..adc3fc1f 100644 --- a/src/main/resources/assets/netherrocks/models/item/illumenite_door.json +++ b/src/main/resources/assets/netherrocks/models/item/illumenite_door.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "aesthetics:item/illumenite_door" + "layer0": "netherrocks:item/illumenite_door" } } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/malachite_bars.json b/src/main/resources/assets/netherrocks/models/item/malachite_bars.json index 154ed52a..2d038b06 100644 --- a/src/main/resources/assets/netherrocks/models/item/malachite_bars.json +++ b/src/main/resources/assets/netherrocks/models/item/malachite_bars.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "aesthetics:block/malachite_bars" + "layer0": "netherrocks:block/malachite_bars" } } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/malachite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/malachite_brick_stairs.json index 2b0b3838..e3f91f03 100644 --- a/src/main/resources/assets/netherrocks/models/item/malachite_brick_stairs.json +++ b/src/main/resources/assets/netherrocks/models/item/malachite_brick_stairs.json @@ -1,3 +1,3 @@ { - "parent": "aesthetics:block/malachite_brick_stairs" + "parent": "netherrocks:block/malachite_brick_stairs" } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/malachite_bricks.json b/src/main/resources/assets/netherrocks/models/item/malachite_bricks.json index e7c53ca0..8fb556c3 100644 --- a/src/main/resources/assets/netherrocks/models/item/malachite_bricks.json +++ b/src/main/resources/assets/netherrocks/models/item/malachite_bricks.json @@ -1,3 +1,3 @@ { - "parent": "aesthetics:block/malachite_bricks" + "parent": "netherrocks:block/malachite_bricks" } diff --git a/src/main/resources/assets/netherrocks/models/item/malachite_door.json b/src/main/resources/assets/netherrocks/models/item/malachite_door.json index 8fd537d6..7fd5a2ca 100644 --- a/src/main/resources/assets/netherrocks/models/item/malachite_door.json +++ b/src/main/resources/assets/netherrocks/models/item/malachite_door.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "aesthetics:item/malachite_door" + "layer0": "netherrocks:item/malachite_door" } } \ No newline at end of file From 37501fc1c5e301a4a50c8b19f4239fd95b600504 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 4 Sep 2021 19:14:16 -0500 Subject: [PATCH 45/56] added to README. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f5f602d3..4e0bdaa2 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,9 @@ Forge mods. I hope I did a good job with it. TO DO ----- -* [1.17.1] add missing raw metal textures. +* Add language entries for brick slabs. +* Investigate doors, they aren't behaving correctly for metal doors. +* [1.17.1] add missing raw metal textures. * [1.17.1] add datagen recipes for raw_metal_blocks & smelting/blasting raw_metal. * [1.17.1] add datagen storage block tags for raw_metal blocks. * update/move wiki From b88d3bc91f202e019864cbba7f85c27db191e8aa Mon Sep 17 00:00:00 2001 From: Sinhika Date: Thu, 9 Sep 2021 19:27:23 -0500 Subject: [PATCH 46/56] made all recipes datagen --- .../alexndr/netherrocks/datagen/Recipes.java | 125 +++++++++++++++++- .../advancements/main/argonite_ore.json | 2 +- .../advancements/main/argonite_sword.json | 2 +- .../advancements/main/ashstone_axe.json | 2 +- .../advancements/main/ashstone_ore.json | 2 +- .../advancements/main/dragonstone_ore.json | 2 +- .../main/dragonstone_pickaxe.json | 2 +- .../advancements/main/fyrite_ore.json | 2 +- .../advancements/main/fyrite_set.json | 8 +- .../advancements/main/illumenite_ore.json | 2 +- .../advancements/main/illumenite_set.json | 8 +- .../advancements/main/malachite_ore.json | 2 +- .../advancements/main/malachite_set.json | 8 +- .../advancements/main/nether_furnace.json | 4 +- .../advancements/recipes/argonite_tools.json | 57 -------- .../advancements/recipes/ashstone_tools.json | 57 -------- .../recipes/dragonstone_armor.json | 50 ------- .../recipes/dragonstone_tools.json | 57 -------- .../advancements/recipes/fyrite_armor.json | 50 ------- .../advancements/recipes/fyrite_tools.json | 50 ------- .../recipes/illumenite_armor.json | 50 ------- .../recipes/illumenite_tools.json | 35 ----- .../advancements/recipes/malachite_armor.json | 50 ------- .../advancements/recipes/malachite_tools.json | 57 -------- .../recipes/more_nether_furnaces.json | 25 ---- .../advancements/recipes/nether_furnace.json | 25 ---- .../netherrocks/recipes/argonite_axe.json | 15 --- .../netherrocks/recipes/argonite_block.json | 15 --- .../netherrocks/recipes/argonite_hoe.json | 16 --- .../netherrocks/recipes/argonite_ingot.json | 11 -- .../recipes/argonite_ingot_from_nuggets.json | 17 --- .../netherrocks/recipes/argonite_nugget.json | 12 -- .../argonite_nugget_from_blasting.json | 23 ---- .../argonite_nugget_from_smelting.json | 23 ---- .../netherrocks/recipes/argonite_pickaxe.json | 16 --- .../netherrocks/recipes/argonite_shovel.json | 16 --- .../netherrocks/recipes/argonite_sword.json | 16 --- .../netherrocks/recipes/ashstone_axe.json | 16 --- .../netherrocks/recipes/ashstone_block.json | 15 --- .../netherrocks/recipes/ashstone_gem.json | 11 -- .../recipes/ashstone_gem_from_blasting.json | 9 -- .../recipes/ashstone_gem_from_smelting.json | 9 -- .../netherrocks/recipes/ashstone_hoe.json | 16 --- .../netherrocks/recipes/ashstone_pickaxe.json | 16 --- .../netherrocks/recipes/ashstone_shovel.json | 16 --- .../netherrocks/recipes/ashstone_sword.json | 16 --- .../netherrocks/recipes/dragonstone_axe.json | 16 --- .../recipes/dragonstone_block.json | 15 --- .../recipes/dragonstone_boots.json | 14 -- .../recipes/dragonstone_chestplate.json | 15 --- .../netherrocks/recipes/dragonstone_gem.json | 11 -- .../dragonstone_gem_from_blasting.json | 9 -- .../dragonstone_gem_from_smelting.json | 9 -- .../recipes/dragonstone_helmet.json | 14 -- .../netherrocks/recipes/dragonstone_hoe.json | 16 --- .../recipes/dragonstone_leggings.json | 15 --- .../recipes/dragonstone_pickaxe.json | 16 --- .../recipes/dragonstone_shovel.json | 16 --- .../recipes/dragonstone_sword.json | 16 --- .../data/netherrocks/recipes/fyrite_axe.json | 16 --- .../netherrocks/recipes/fyrite_block.json | 15 --- .../netherrocks/recipes/fyrite_boots.json | 14 -- .../recipes/fyrite_chestplate.json | 15 --- .../netherrocks/recipes/fyrite_helmet.json | 14 -- .../netherrocks/recipes/fyrite_ingot.json | 11 -- .../recipes/fyrite_ingot_from_nuggets.json | 17 --- .../netherrocks/recipes/fyrite_leggings.json | 15 --- .../netherrocks/recipes/fyrite_nugget.json | 12 -- .../recipes/fyrite_nugget_from_blasting.json | 32 ----- .../recipes/fyrite_nugget_from_smelting.json | 32 ----- .../netherrocks/recipes/fyrite_pickaxe.json | 16 --- .../netherrocks/recipes/fyrite_shovel.json | 16 --- .../netherrocks/recipes/fyrite_sword.json | 16 --- .../netherrocks/recipes/illumenite_block.json | 15 --- .../netherrocks/recipes/illumenite_boots.json | 14 -- .../recipes/illumenite_chestplate.json | 15 --- .../recipes/illumenite_helmet.json | 14 -- .../netherrocks/recipes/illumenite_ingot.json | 11 -- .../illumenite_ingot_from_nuggets.json | 17 --- .../recipes/illumenite_leggings.json | 15 --- .../recipes/illumenite_nugget.json | 12 -- .../illumenite_nugget_from_blasting.json | 23 ---- .../illumenite_nugget_from_smelting.json | 23 ---- .../netherrocks/recipes/illumenite_sword.json | 16 --- .../netherrocks/recipes/malachite_axe.json | 16 --- .../netherrocks/recipes/malachite_block.json | 15 --- .../netherrocks/recipes/malachite_boots.json | 14 -- .../recipes/malachite_chestplate.json | 15 --- .../netherrocks/recipes/malachite_helmet.json | 14 -- .../netherrocks/recipes/malachite_hoe.json | 16 --- .../netherrocks/recipes/malachite_ingot.json | 11 -- .../recipes/malachite_ingot_from_nuggets.json | 17 --- .../recipes/malachite_leggings.json | 15 --- .../netherrocks/recipes/malachite_nugget.json | 12 -- .../malachite_nugget_from_blasting.json | 35 ----- .../malachite_nugget_from_smelting.json | 35 ----- .../recipes/malachite_pickaxe.json | 16 --- .../netherrocks/recipes/malachite_shovel.json | 16 --- .../netherrocks/recipes/malachite_sword.json | 16 --- .../recipes/nether_blast_furnace.json | 22 --- .../netherrocks/recipes/nether_furnace.json | 15 --- .../netherrocks/recipes/nether_smoker.json | 19 --- 102 files changed, 143 insertions(+), 1812 deletions(-) delete mode 100644 src/main/resources/data/netherrocks/advancements/recipes/argonite_tools.json delete mode 100644 src/main/resources/data/netherrocks/advancements/recipes/ashstone_tools.json delete mode 100644 src/main/resources/data/netherrocks/advancements/recipes/dragonstone_armor.json delete mode 100644 src/main/resources/data/netherrocks/advancements/recipes/dragonstone_tools.json delete mode 100644 src/main/resources/data/netherrocks/advancements/recipes/fyrite_armor.json delete mode 100644 src/main/resources/data/netherrocks/advancements/recipes/fyrite_tools.json delete mode 100644 src/main/resources/data/netherrocks/advancements/recipes/illumenite_armor.json delete mode 100644 src/main/resources/data/netherrocks/advancements/recipes/illumenite_tools.json delete mode 100644 src/main/resources/data/netherrocks/advancements/recipes/malachite_armor.json delete mode 100644 src/main/resources/data/netherrocks/advancements/recipes/malachite_tools.json delete mode 100644 src/main/resources/data/netherrocks/advancements/recipes/more_nether_furnaces.json delete mode 100644 src/main/resources/data/netherrocks/advancements/recipes/nether_furnace.json delete mode 100644 src/main/resources/data/netherrocks/recipes/argonite_axe.json delete mode 100644 src/main/resources/data/netherrocks/recipes/argonite_block.json delete mode 100644 src/main/resources/data/netherrocks/recipes/argonite_hoe.json delete mode 100644 src/main/resources/data/netherrocks/recipes/argonite_ingot.json delete mode 100644 src/main/resources/data/netherrocks/recipes/argonite_ingot_from_nuggets.json delete mode 100644 src/main/resources/data/netherrocks/recipes/argonite_nugget.json delete mode 100644 src/main/resources/data/netherrocks/recipes/argonite_nugget_from_blasting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/argonite_nugget_from_smelting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/argonite_pickaxe.json delete mode 100644 src/main/resources/data/netherrocks/recipes/argonite_shovel.json delete mode 100644 src/main/resources/data/netherrocks/recipes/argonite_sword.json delete mode 100644 src/main/resources/data/netherrocks/recipes/ashstone_axe.json delete mode 100644 src/main/resources/data/netherrocks/recipes/ashstone_block.json delete mode 100644 src/main/resources/data/netherrocks/recipes/ashstone_gem.json delete mode 100644 src/main/resources/data/netherrocks/recipes/ashstone_gem_from_blasting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/ashstone_gem_from_smelting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/ashstone_hoe.json delete mode 100644 src/main/resources/data/netherrocks/recipes/ashstone_pickaxe.json delete mode 100644 src/main/resources/data/netherrocks/recipes/ashstone_shovel.json delete mode 100644 src/main/resources/data/netherrocks/recipes/ashstone_sword.json delete mode 100644 src/main/resources/data/netherrocks/recipes/dragonstone_axe.json delete mode 100644 src/main/resources/data/netherrocks/recipes/dragonstone_block.json delete mode 100644 src/main/resources/data/netherrocks/recipes/dragonstone_boots.json delete mode 100644 src/main/resources/data/netherrocks/recipes/dragonstone_chestplate.json delete mode 100644 src/main/resources/data/netherrocks/recipes/dragonstone_gem.json delete mode 100644 src/main/resources/data/netherrocks/recipes/dragonstone_gem_from_blasting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/dragonstone_gem_from_smelting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/dragonstone_helmet.json delete mode 100644 src/main/resources/data/netherrocks/recipes/dragonstone_hoe.json delete mode 100644 src/main/resources/data/netherrocks/recipes/dragonstone_leggings.json delete mode 100644 src/main/resources/data/netherrocks/recipes/dragonstone_pickaxe.json delete mode 100644 src/main/resources/data/netherrocks/recipes/dragonstone_shovel.json delete mode 100644 src/main/resources/data/netherrocks/recipes/dragonstone_sword.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_axe.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_block.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_boots.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_chestplate.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_helmet.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_ingot.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_nuggets.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_leggings.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_nugget.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_nugget_from_blasting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_nugget_from_smelting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_pickaxe.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_shovel.json delete mode 100644 src/main/resources/data/netherrocks/recipes/fyrite_sword.json delete mode 100644 src/main/resources/data/netherrocks/recipes/illumenite_block.json delete mode 100644 src/main/resources/data/netherrocks/recipes/illumenite_boots.json delete mode 100644 src/main/resources/data/netherrocks/recipes/illumenite_chestplate.json delete mode 100644 src/main/resources/data/netherrocks/recipes/illumenite_helmet.json delete mode 100644 src/main/resources/data/netherrocks/recipes/illumenite_ingot.json delete mode 100644 src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_nuggets.json delete mode 100644 src/main/resources/data/netherrocks/recipes/illumenite_leggings.json delete mode 100644 src/main/resources/data/netherrocks/recipes/illumenite_nugget.json delete mode 100644 src/main/resources/data/netherrocks/recipes/illumenite_nugget_from_blasting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/illumenite_nugget_from_smelting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/illumenite_sword.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_axe.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_block.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_boots.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_chestplate.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_helmet.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_hoe.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_ingot.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_ingot_from_nuggets.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_leggings.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_nugget.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_nugget_from_blasting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_nugget_from_smelting.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_pickaxe.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_shovel.json delete mode 100644 src/main/resources/data/netherrocks/recipes/malachite_sword.json delete mode 100644 src/main/resources/data/netherrocks/recipes/nether_blast_furnace.json delete mode 100644 src/main/resources/data/netherrocks/recipes/nether_furnace.json delete mode 100644 src/main/resources/data/netherrocks/recipes/nether_smoker.json diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java b/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java index 0e4f2ffa..0a0f71ab 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java @@ -11,7 +11,11 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.data.recipes.ShapedRecipeBuilder; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.crafting.conditions.ICondition; import net.minecraftforge.common.crafting.conditions.IConditionBuilder; @@ -28,14 +32,77 @@ public Recipes(DataGenerator generatorIn) protected void buildCraftingRecipes(Consumer consumer) { registerStorageRecipes(consumer); -// registerMiscRecipes(consumer); -// registerToolRecipes(consumer); -// registerArmorRecipes(consumer); + registerMiscRecipes(consumer); + registerToolRecipes(consumer); + registerArmorRecipes(consumer); registerFurnaceRecipes(consumer); registerAestheticRecipes(consumer); } // end registerRecipes() + protected void registerMiscRecipes(Consumer consumer) + { + // nether furnace recipes + ShapedRecipeBuilder.shaped(ModBlocks.nether_furnace.get()) + .define('S', Blocks.NETHERRACK) + .define('Y', Items.FLINT_AND_STEEL) + .pattern("SSS") + .pattern("SYS") + .pattern("SSS") + .unlockedBy("has_item", has(Blocks.NETHERRACK)) + .save(consumer); + + ShapedRecipeBuilder.shaped(ModBlocks.nether_smoker.get()) + .define('#', ItemTags.LOGS) + .define('X', ModBlocks.nether_furnace.get()) + .pattern(" # ") + .pattern("#X#") + .pattern(" # ") + .unlockedBy("has_item", has(ModBlocks.nether_furnace.get())) + .save(consumer); + + ShapedRecipeBuilder.shaped(ModBlocks.nether_blast_furnace.get()) + .define('#', Items.NETHER_BRICK) + .define('I', Items.IRON_INGOT) + .define('X', ModBlocks.nether_furnace.get()) + .pattern("III") + .pattern("IXI") + .pattern("###") + .unlockedBy("has_item", has(ModBlocks.nether_furnace.get())) + .save(consumer); + + } // end registerMiscRecipes + + + protected void registerToolRecipes(Consumer consumer) + { + setbuilder.buildSimpleToolSet(consumer, Ingredient.of(ModItems.argonite_ingot.get()), + "argonite", has(ModItems.argonite_ingot.get()), null, false); + setbuilder.buildSimpleToolSet(consumer, Ingredient.of(ModItems.ashstone_gem.get()), + "ashstone", has(ModItems.ashstone_gem.get()), null, false); + setbuilder.buildSimpleToolSet(consumer, Ingredient.of(ModItems.dragonstone_gem.get()), + "dragonstone", has(ModItems.dragonstone_gem.get()), null, false); + setbuilder.buildSimpleToolSet(consumer, Ingredient.of(ModItems.illumenite_ingot.get()), + "illumenite", has(ModItems.illumenite_ingot.get()), null, false); + setbuilder.buildSimpleToolSet(consumer, Ingredient.of(ModItems.fyrite_ingot.get()), + "fyrite", has(ModItems.fyrite_ingot.get()), null, false); + setbuilder.buildSimpleToolSet(consumer, Ingredient.of(ModItems.malachite_ingot.get()), + "malachite", has(ModItems.malachite_ingot.get()), null, false); + } // end registerToolRecipes() + + protected void registerArmorRecipes(Consumer consumer) + { + setbuilder.buildSimpleArmorSet(consumer, Ingredient.of(ModItems.dragonstone_gem.get()), + "dragonstone", has(ModItems.dragonstone_gem.get()), null); + setbuilder.buildSimpleArmorSet(consumer, Ingredient.of(ModItems.fyrite_ingot.get()), "fyrite", + has(ModItems.fyrite_ingot.get()), null); + setbuilder.buildSimpleArmorSet(consumer, Ingredient.of(ModItems.illumenite_ingot.get()), "illumenite", + has(ModItems.illumenite_ingot.get()), null); + setbuilder.buildSimpleArmorSet(consumer, Ingredient.of(ModItems.malachite_ingot.get()), "malachite", + has(ModItems.malachite_ingot.get()), null); + } // end registerArmorRecipes() + + protected void registerAestheticRecipes(Consumer consumer) { setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.argonite_ingot.get()), "argonite", @@ -50,7 +117,8 @@ protected void registerAestheticRecipes(Consumer consumer) has(ModItems.illumenite_ingot.get()), flag("aesthetics_enabled")); setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.malachite_ingot.get()), "malachite", has(ModItems.malachite_ingot.get()), flag("aesthetics_enabled")); - } + } // end registerAestheticRecipes() + protected void registerStorageRecipes(Consumer consumer) { @@ -62,7 +130,27 @@ protected void registerStorageRecipes(Consumer consumer) ModBlocks.raw_argonite_block.get(), null, has(ModItems.raw_argonite.get())); setbuilder.buildSimpleStorageRecipes(consumer, ModItems.raw_malachite.get(), ModBlocks.raw_malachite_block.get(), null, has(ModItems.raw_malachite.get())); - } + + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.argonite_ingot.get(), + ModBlocks.argonite_block.get().asItem(), ModItems.argonite_nugget.get(), + has(ModItems.argonite_ingot.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.fyrite_ingot.get(), + ModBlocks.fyrite_block.get().asItem(), ModItems.fyrite_nugget.get(), + has(ModItems.fyrite_ingot.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.illumenite_ingot.get(), + ModBlocks.illumenite_block.get().asItem(), ModItems.illumenite_nugget.get(), + has(ModItems.illumenite_ingot.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.malachite_ingot.get(), + ModBlocks.malachite_block.get().asItem(), ModItems.malachite_nugget.get(), + has(ModItems.malachite_ingot.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.ashstone_gem.get(), + ModBlocks.ashstone_block.get().asItem(), null, + has(ModItems.ashstone_gem.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.dragonstone_gem.get(), + ModBlocks.dragonstone_block.get().asItem(), null, + has(ModItems.dragonstone_gem.get())); + } // end registerStorageRecipes() + protected void registerFurnaceRecipes(Consumer consumer) { @@ -75,6 +163,10 @@ protected void registerFurnaceRecipes(Consumer consumer) setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModItems.raw_malachite.get()), ModItems.malachite_ingot.get(), has(ModItems.raw_malachite.get()), 0.5F, 200); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.ashstone_ore.get()), ModItems.ashstone_gem.get(), + has(ModBlocks.ashstone_ore.get()), 0.8F, 200, "_from_ore"); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.dragonstone_ore.get()), ModItems.dragonstone_gem.get(), + has(ModBlocks.dragonstone_ore.get()), 0.8F, 200, "_from_ore"); setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.fyrite_ore.get()), ModItems.fyrite_ingot.get(), has(ModBlocks.fyrite_ore.get()), 0.8F, 200, "_from_ore"); setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.illumenite_ore.get()), ModItems.illumenite_ingot.get(), @@ -83,7 +175,28 @@ protected void registerFurnaceRecipes(Consumer consumer) has(ModBlocks.argonite_ore.get()), 0.7F, 200, "_from_ore"); setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.malachite_ore.get()), ModItems.malachite_ingot.get(), has(ModBlocks.malachite_ore.get()), 0.5F, 200, "_from_ore"); - } + + // vanilla recycling + setbuilder.buildVanillaRecyclingRecipes(consumer, Ingredient.of(ModItems.argonite_axe.get(), + ModItems.argonite_hoe.get(), ModItems.argonite_pickaxe.get(), ModItems.argonite_shovel.get(), + ModItems.argonite_sword.get()), ModItems.argonite_nugget.get(), + has(ModItems.argonite_axe.get()), 0.3F, 200); + setbuilder.buildVanillaRecyclingRecipes(consumer, Ingredient.of(ModItems.fyrite_axe.get(), + ModItems.fyrite_pickaxe.get(), ModItems.fyrite_shovel.get(), ModItems.fyrite_boots.get(), + ModItems.fyrite_sword.get(), ModItems.fyrite_chestplate.get(), ModItems.fyrite_helmet.get(), + ModItems.fyrite_leggings.get()), + ModItems.fyrite_nugget.get(), has(ModItems.fyrite_axe.get()), 0.3F, 200); + setbuilder.buildVanillaRecyclingRecipes(consumer, Ingredient.of(ModItems.illumenite_boots.get(), + ModItems.illumenite_sword.get(), ModItems.illumenite_chestplate.get(), ModItems.illumenite_helmet.get(), + ModItems.illumenite_leggings.get()), + ModItems.illumenite_nugget.get(), has(ModItems.illumenite_sword.get()), 0.3F, 200); + setbuilder.buildVanillaRecyclingRecipes(consumer, Ingredient.of(ModItems.malachite_axe.get(), + ModItems.malachite_pickaxe.get(), ModItems.malachite_shovel.get(), ModItems.malachite_boots.get(), + ModItems.malachite_sword.get(), ModItems.malachite_chestplate.get(), ModItems.malachite_helmet.get(), + ModItems.malachite_leggings.get(), ModItems.malachite_hoe.get()), + ModItems.malachite_nugget.get(), has(ModItems.malachite_axe.get()), 0.3F, 200); + + } // end registerFurnaceRecipes() @Override public ICondition flag(String arg0) diff --git a/src/main/resources/data/netherrocks/advancements/main/argonite_ore.json b/src/main/resources/data/netherrocks/advancements/main/argonite_ore.json index b6824aff..33738f99 100644 --- a/src/main/resources/data/netherrocks/advancements/main/argonite_ore.json +++ b/src/main/resources/data/netherrocks/advancements/main/argonite_ore.json @@ -23,7 +23,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:argonite_ore"} + {"items" : ["netherrocks:argonite_ore","netherrocks:raw_argonite"] } ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/argonite_sword.json b/src/main/resources/data/netherrocks/advancements/main/argonite_sword.json index 8fc17eea..883f138a 100644 --- a/src/main/resources/data/netherrocks/advancements/main/argonite_sword.json +++ b/src/main/resources/data/netherrocks/advancements/main/argonite_sword.json @@ -18,7 +18,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:argonite_sword"} + {"items" : ["netherrocks:argonite_sword"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/ashstone_axe.json b/src/main/resources/data/netherrocks/advancements/main/ashstone_axe.json index d032181e..5c8f7316 100644 --- a/src/main/resources/data/netherrocks/advancements/main/ashstone_axe.json +++ b/src/main/resources/data/netherrocks/advancements/main/ashstone_axe.json @@ -18,7 +18,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:ashstone_axe"} + {"items" : ["netherrocks:ashstone_axe"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/ashstone_ore.json b/src/main/resources/data/netherrocks/advancements/main/ashstone_ore.json index e2a553a2..9454c606 100644 --- a/src/main/resources/data/netherrocks/advancements/main/ashstone_ore.json +++ b/src/main/resources/data/netherrocks/advancements/main/ashstone_ore.json @@ -23,7 +23,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:ashstone_ore"} + {"items" : ["netherrocks:ashstone_ore","netherrocks:ashstone_gem"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/dragonstone_ore.json b/src/main/resources/data/netherrocks/advancements/main/dragonstone_ore.json index 4b19b190..b5062833 100644 --- a/src/main/resources/data/netherrocks/advancements/main/dragonstone_ore.json +++ b/src/main/resources/data/netherrocks/advancements/main/dragonstone_ore.json @@ -23,7 +23,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:dragonstone_ore"} + {"items" : ["netherrocks:dragonstone_ore","netherrocks:dragonstone_gem"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/dragonstone_pickaxe.json b/src/main/resources/data/netherrocks/advancements/main/dragonstone_pickaxe.json index 2ee39710..7154c24c 100644 --- a/src/main/resources/data/netherrocks/advancements/main/dragonstone_pickaxe.json +++ b/src/main/resources/data/netherrocks/advancements/main/dragonstone_pickaxe.json @@ -18,7 +18,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:dragonstone_pickaxe"} + {"items" : ["netherrocks:dragonstone_pickaxe"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/fyrite_ore.json b/src/main/resources/data/netherrocks/advancements/main/fyrite_ore.json index 23b2f05b..ded254ce 100644 --- a/src/main/resources/data/netherrocks/advancements/main/fyrite_ore.json +++ b/src/main/resources/data/netherrocks/advancements/main/fyrite_ore.json @@ -23,7 +23,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:fyrite_ore"} + {"items" : ["netherrocks:fyrite_ore","netherrocks:raw_fyrite"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/fyrite_set.json b/src/main/resources/data/netherrocks/advancements/main/fyrite_set.json index caf82904..e1f2c3c2 100644 --- a/src/main/resources/data/netherrocks/advancements/main/fyrite_set.json +++ b/src/main/resources/data/netherrocks/advancements/main/fyrite_set.json @@ -18,7 +18,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:fyrite_chestplate"} + {"items" : ["netherrocks:fyrite_chestplate"]} ] } }, @@ -26,7 +26,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:fyrite_leggings"} + {"items" : ["netherrocks:fyrite_leggings"]} ] } }, @@ -34,7 +34,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:fyrite_helmet"} + {"items" : ["netherrocks:fyrite_helmet"]} ] } }, @@ -42,7 +42,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:fyrite_boots"} + {"items" : ["netherrocks:fyrite_boots"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/illumenite_ore.json b/src/main/resources/data/netherrocks/advancements/main/illumenite_ore.json index 81832532..726d1c81 100644 --- a/src/main/resources/data/netherrocks/advancements/main/illumenite_ore.json +++ b/src/main/resources/data/netherrocks/advancements/main/illumenite_ore.json @@ -23,7 +23,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:illumenite_ore"} + {"items" : ["netherrocks:illumenite_ore", "netherrocks:raw_illumenite"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/illumenite_set.json b/src/main/resources/data/netherrocks/advancements/main/illumenite_set.json index 6e44c8d1..e61eec7b 100644 --- a/src/main/resources/data/netherrocks/advancements/main/illumenite_set.json +++ b/src/main/resources/data/netherrocks/advancements/main/illumenite_set.json @@ -18,7 +18,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:illumenite_chestplate"} + {"items" : ["netherrocks:illumenite_chestplate"]} ] } }, @@ -26,7 +26,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:illumenite_leggings"} + {"items" : ["netherrocks:illumenite_leggings"]} ] } }, @@ -34,7 +34,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:illumenite_helmet"} + {"items" : ["netherrocks:illumenite_helmet"]} ] } }, @@ -42,7 +42,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:illumenite_boots"} + {"items" : ["netherrocks:illumenite_boots"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/malachite_ore.json b/src/main/resources/data/netherrocks/advancements/main/malachite_ore.json index 44d01a3b..4ebc0317 100644 --- a/src/main/resources/data/netherrocks/advancements/main/malachite_ore.json +++ b/src/main/resources/data/netherrocks/advancements/main/malachite_ore.json @@ -23,7 +23,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:malachite_ore"} + {"items" : ["netherrocks:malachite_ore","netherrocks:raw_malachite"] } ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/malachite_set.json b/src/main/resources/data/netherrocks/advancements/main/malachite_set.json index 2a95ae5c..290edd94 100644 --- a/src/main/resources/data/netherrocks/advancements/main/malachite_set.json +++ b/src/main/resources/data/netherrocks/advancements/main/malachite_set.json @@ -18,7 +18,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:malachite_chestplate"} + {"items" : ["netherrocks:malachite_chestplate"]} ] } }, @@ -26,7 +26,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:malachite_leggings"} + {"items" : ["netherrocks:malachite_leggings"]} ] } }, @@ -34,7 +34,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:malachite_helmet"} + {"items" : ["netherrocks:malachite_helmet"]} ] } }, @@ -42,7 +42,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:malachite_boots"} + {"items" : ["netherrocks:malachite_boots"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/nether_furnace.json b/src/main/resources/data/netherrocks/advancements/main/nether_furnace.json index 9bdab986..1ad76ac1 100644 --- a/src/main/resources/data/netherrocks/advancements/main/nether_furnace.json +++ b/src/main/resources/data/netherrocks/advancements/main/nether_furnace.json @@ -18,7 +18,9 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:nether_furnace"} + { "items" : [ + "netherrocks:nether_furnace", "netherrocks:nether_smoker", + "netherrocks:nether_blast_furnace" ]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/recipes/argonite_tools.json b/src/main/resources/data/netherrocks/advancements/recipes/argonite_tools.json deleted file mode 100644 index 1f92dffe..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/argonite_tools.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:argonite_axe", "netherrocks:argonite_hoe", "netherrocks:argonite_pickaxe", - "netherrocks:argonite_shovel", "netherrocks:argonite_sword" - ] - }, - "criteria" : { - "has_argonite" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:argonite_ingot" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:argonite_axe" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:argonite_hoe" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:argonite_pickaxe" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:argonite_shovel" - } - }, - "has_recipe5" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:argonite_sword" - } - } - }, - "requirements": [ - [ - "has_argonite", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4", - "has_recipe5" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/ashstone_tools.json b/src/main/resources/data/netherrocks/advancements/recipes/ashstone_tools.json deleted file mode 100644 index e2782c36..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/ashstone_tools.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:ashstone_axe", "netherrocks:ashstone_hoe", "netherrocks:ashstone_pickaxe", - "netherrocks:ashstone_shovel", "netherrocks:ashstone_sword" - ] - }, - "criteria" : { - "has_ashstone" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:ashstone_gem" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:ashstone_axe" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:ashstone_hoe" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:ashstone_pickaxe" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:ashstone_shovel" - } - }, - "has_recipe5" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:ashstone_sword" - } - } - }, - "requirements": [ - [ - "has_ashstone", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4", - "has_recipe5" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/dragonstone_armor.json b/src/main/resources/data/netherrocks/advancements/recipes/dragonstone_armor.json deleted file mode 100644 index dc88ed80..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/dragonstone_armor.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:dragonstone_boots", "netherrocks:dragonstone_chestplate", - "netherrocks:dragonstone_helmet", "netherrocks:dragonstone_leggings" - ] - }, - "criteria" : { - "has_dragonstone" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:dragonstone_gem" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_boots" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_chestplate" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_helmet" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_leggings" - } - } - }, - "requirements": [ - [ - "has_dragonstone", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/dragonstone_tools.json b/src/main/resources/data/netherrocks/advancements/recipes/dragonstone_tools.json deleted file mode 100644 index 6a0ecd26..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/dragonstone_tools.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:dragonstone_axe", "netherrocks:dragonstone_hoe", "netherrocks:dragonstone_pickaxe", - "netherrocks:dragonstone_shovel", "netherrocks:dragonstone_sword" - ] - }, - "criteria" : { - "has_dragonstone" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:dragonstone_gem" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_axe" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_hoe" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_pickaxe" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_shovel" - } - }, - "has_recipe5" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_sword" - } - } - }, - "requirements": [ - [ - "has_dragonstone", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4", - "has_recipe5" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/fyrite_armor.json b/src/main/resources/data/netherrocks/advancements/recipes/fyrite_armor.json deleted file mode 100644 index 04c9b4f5..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/fyrite_armor.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:fyrite_boots", "netherrocks:fyrite_chestplate", - "netherrocks:fyrite_helmet", "netherrocks:fyrite_leggings" - ] - }, - "criteria" : { - "has_fyrite" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:fyrite_ingot" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_boots" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_chestplate" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_helmet" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_leggings" - } - } - }, - "requirements": [ - [ - "has_fyrite", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/fyrite_tools.json b/src/main/resources/data/netherrocks/advancements/recipes/fyrite_tools.json deleted file mode 100644 index ba23d964..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/fyrite_tools.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:fyrite_axe", "netherrocks:fyrite_pickaxe", - "netherrocks:fyrite_shovel", "netherrocks:fyrite_sword" - ] - }, - "criteria" : { - "has_fyrite" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:fyrite_ingot" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_axe" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_pickaxe" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_shovel" - } - }, - "has_recipe5" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_sword" - } - } - }, - "requirements": [ - [ - "has_fyrite", "has_recipe1", "has_recipe3","has_recipe4", "has_recipe5" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/illumenite_armor.json b/src/main/resources/data/netherrocks/advancements/recipes/illumenite_armor.json deleted file mode 100644 index e47b1011..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/illumenite_armor.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:illumenite_boots", "netherrocks:illumenite_chestplate", - "netherrocks:illumenite_helmet", "netherrocks:illumenite_leggings" - ] - }, - "criteria" : { - "has_illumenite" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:illumenite_ingot" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:illumenite_boots" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:illumenite_chestplate" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:illumenite_helmet" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:illumenite_leggings" - } - } - }, - "requirements": [ - [ - "has_illumenite", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/illumenite_tools.json b/src/main/resources/data/netherrocks/advancements/recipes/illumenite_tools.json deleted file mode 100644 index d1898a87..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/illumenite_tools.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:illumenite_sword" - ] - }, - "criteria" : { - "has_illumenite" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:illumenite_ingot" - } - ] - } - }, - "has_sword" : { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item" : "netherrocks:illumenite_sword" - } - ] - } - } - }, - "requirements": [ - [ - "has_illumenite", "has_sword" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/malachite_armor.json b/src/main/resources/data/netherrocks/advancements/recipes/malachite_armor.json deleted file mode 100644 index 7ac0e27f..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/malachite_armor.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:malachite_boots", "netherrocks:malachite_chestplate", - "netherrocks:malachite_helmet", "netherrocks:malachite_leggings" - ] - }, - "criteria" : { - "has_malachite" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:malachite_ingot" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_boots" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_chestplate" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_helmet" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_leggings" - } - } - }, - "requirements": [ - [ - "has_malachite", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/malachite_tools.json b/src/main/resources/data/netherrocks/advancements/recipes/malachite_tools.json deleted file mode 100644 index 2bf0e011..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/malachite_tools.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:malachite_axe", "netherrocks:malachite_hoe", "netherrocks:malachite_pickaxe", - "netherrocks:malachite_shovel", "netherrocks:malachite_sword" - ] - }, - "criteria" : { - "has_malachite" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:malachite_ingot" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_axe" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_hoe" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_pickaxe" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_shovel" - } - }, - "has_recipe5" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_sword" - } - } - }, - "requirements": [ - [ - "has_malachite", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4", - "has_recipe5" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/more_nether_furnaces.json b/src/main/resources/data/netherrocks/advancements/recipes/more_nether_furnaces.json deleted file mode 100644 index d4c28268..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/more_nether_furnaces.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:nether_smoker", "netherrocks:nether_blast_furnace" - ] - }, - "criteria" : { - "has_nether_furnace" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:nether_furnace" - } - ] - } - } - }, - "requirements": [ - [ - "has_nether_furnace" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/nether_furnace.json b/src/main/resources/data/netherrocks/advancements/recipes/nether_furnace.json deleted file mode 100644 index edfb6897..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/nether_furnace.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:nether_furnace" - ] - }, - "criteria" : { - "has_netherrack" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "minecraft:netherrack" - } - ] - } - } - }, - "requirements": [ - [ - "has_netherrack" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/recipes/argonite_axe.json b/src/main/resources/data/netherrocks/recipes/argonite_axe.json deleted file mode 100644 index 4dfb530f..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_axe.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "result" : { - "item" : "netherrocks:argonite_axe" - }, - "pattern" : [ - "SS ", - "ST ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/argonite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} diff --git a/src/main/resources/data/netherrocks/recipes/argonite_block.json b/src/main/resources/data/netherrocks/recipes/argonite_block.json deleted file mode 100644 index 1703f09d..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "type" : "minecraft:crafting_shaped", - "result" : { - "item" : "netherrocks:argonite_block" - }, - "pattern" : [ - "SSS", - "SSS", - "SSS" - ], - "key" : { - "S" : { "item" : "netherrocks:argonite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_hoe.json b/src/main/resources/data/netherrocks/recipes/argonite_hoe.json deleted file mode 100644 index 2fe33fec..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_hoe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:argonite_hoe" - }, - "pattern" : [ - "SS ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/argonite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_ingot.json b/src/main/resources/data/netherrocks/recipes/argonite_ingot.json deleted file mode 100644 index 3ba7b65d..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_ingot.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "type" : "minecraft:crafting_shapeless", - "ingredients" : [ - { "item" : "netherrocks:argonite_block" } - ], - "result" : { - "item" : "netherrocks:argonite_ingot", - "count" : 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_nuggets.json b/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_nuggets.json deleted file mode 100644 index 512ba53c..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_nuggets.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "argonite_ingot", - "pattern": [ - "###", - "###", - "###" - ], - "key": { - "#": { - "item": "netherrocks:argonite_nugget" - } - }, - "result": { - "item": "netherrocks:argonite_ingot" - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_nugget.json b/src/main/resources/data/netherrocks/recipes/argonite_nugget.json deleted file mode 100644 index 2c5e2ba4..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_nugget.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "netherrocks:argonite_ingot" - } - ], - "result": { - "item": "netherrocks:argonite_nugget", - "count": 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_nugget_from_blasting.json b/src/main/resources/data/netherrocks/recipes/argonite_nugget_from_blasting.json deleted file mode 100644 index a565123f..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_nugget_from_blasting.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": [ - { - "item": "netherrocks:argonite_pickaxe" - }, - { - "item": "netherrocks:argonite_shovel" - }, - { - "item": "netherrocks:argonite_axe" - }, - { - "item": "netherrocks:argonite_hoe" - }, - { - "item": "netherrocks:argonite_sword" - } - ], - "result": "netherrocks:argonite_nugget", - "experience": 0.3, - "cookingtime": 100 -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_nugget_from_smelting.json b/src/main/resources/data/netherrocks/recipes/argonite_nugget_from_smelting.json deleted file mode 100644 index 19dd825c..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_nugget_from_smelting.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": [ - { - "item": "netherrocks:argonite_pickaxe" - }, - { - "item": "netherrocks:argonite_shovel" - }, - { - "item": "netherrocks:argonite_axe" - }, - { - "item": "netherrocks:argonite_hoe" - }, - { - "item": "netherrocks:argonite_sword" - } - ], - "result": "netherrocks:argonite_nugget", - "experience": 0.3, - "cookingtime": 200 -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_pickaxe.json b/src/main/resources/data/netherrocks/recipes/argonite_pickaxe.json deleted file mode 100644 index 44640028..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_pickaxe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:argonite_pickaxe" - }, - "pattern" : [ - "SSS", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/argonite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_shovel.json b/src/main/resources/data/netherrocks/recipes/argonite_shovel.json deleted file mode 100644 index 1be522c4..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_shovel.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:argonite_shovel" - }, - "pattern" : [ - " S ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/argonite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_sword.json b/src/main/resources/data/netherrocks/recipes/argonite_sword.json deleted file mode 100644 index 7dd2f9b5..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_sword.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:argonite_sword" - }, - "pattern" : [ - " S ", - " S ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/argonite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_axe.json b/src/main/resources/data/netherrocks/recipes/ashstone_axe.json deleted file mode 100644 index 5259d5b0..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_axe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:ashstone_axe" - }, - "pattern" : [ - "SS ", - "ST ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/ashstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_block.json b/src/main/resources/data/netherrocks/recipes/ashstone_block.json deleted file mode 100644 index b1ba06f0..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "type" : "minecraft:crafting_shaped", - "result" : { - "item" : "netherrocks:ashstone_block" - }, - "pattern" : [ - "SSS", - "SSS", - "SSS" - ], - "key" : { - "S" : { "item" : "netherrocks:ashstone_gem"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_gem.json b/src/main/resources/data/netherrocks/recipes/ashstone_gem.json deleted file mode 100644 index 1a52104f..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_gem.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "type" : "minecraft:crafting_shapeless", - "ingredients" : [ - { "item" : "netherrocks:ashstone_block" } - ], - "result" : { - "item" : "netherrocks:ashstone_gem", - "count" : 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_gem_from_blasting.json b/src/main/resources/data/netherrocks/recipes/ashstone_gem_from_blasting.json deleted file mode 100644 index b5ae5035..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_gem_from_blasting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "item": "netherrocks:ashstone_ore" - }, - "result": "netherrocks:ashstone_gem", - "experience": 0.8, - "cookingtime": 100 -} diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_gem_from_smelting.json b/src/main/resources/data/netherrocks/recipes/ashstone_gem_from_smelting.json deleted file mode 100644 index 6eacb2ed..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_gem_from_smelting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "netherrocks:ashstone_ore" - }, - "result": "netherrocks:ashstone_gem", - "experience": 0.8, - "cookingtime": 200 -} diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_hoe.json b/src/main/resources/data/netherrocks/recipes/ashstone_hoe.json deleted file mode 100644 index 2f7cbb27..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_hoe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:ashstone_hoe" - }, - "pattern" : [ - "SS ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/ashstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_pickaxe.json b/src/main/resources/data/netherrocks/recipes/ashstone_pickaxe.json deleted file mode 100644 index 020fb1d0..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_pickaxe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:ashstone_pickaxe" - }, - "pattern" : [ - "SSS", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/ashstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_shovel.json b/src/main/resources/data/netherrocks/recipes/ashstone_shovel.json deleted file mode 100644 index d35ae4cf..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_shovel.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:ashstone_shovel" - }, - "pattern" : [ - " S ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/ashstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_sword.json b/src/main/resources/data/netherrocks/recipes/ashstone_sword.json deleted file mode 100644 index 65a32948..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_sword.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:ashstone_sword" - }, - "pattern" : [ - " S ", - " S ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/ashstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_axe.json b/src/main/resources/data/netherrocks/recipes/dragonstone_axe.json deleted file mode 100644 index 4f2d6593..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_axe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_axe" - }, - "pattern" : [ - "SS ", - "ST ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_block.json b/src/main/resources/data/netherrocks/recipes/dragonstone_block.json deleted file mode 100644 index 49d905e2..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "type" : "minecraft:crafting_shaped", - "result" : { - "item" : "netherrocks:dragonstone_block" - }, - "pattern" : [ - "SSS", - "SSS", - "SSS" - ], - "key" : { - "S" : { "item" : "netherrocks:dragonstone_gem"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_boots.json b/src/main/resources/data/netherrocks/recipes/dragonstone_boots.json deleted file mode 100644 index 34b5467c..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_boots.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_boots" - }, - "pattern" : [ - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_chestplate.json b/src/main/resources/data/netherrocks/recipes/dragonstone_chestplate.json deleted file mode 100644 index c9ec8154..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_chestplate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_chestplate" - }, - "pattern" : [ - "S S", - "SSS", - "SSS" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_gem.json b/src/main/resources/data/netherrocks/recipes/dragonstone_gem.json deleted file mode 100644 index 008f4b27..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_gem.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "type" : "minecraft:crafting_shapeless", - "ingredients" : [ - { "item" : "netherrocks:dragonstone_block" } - ], - "result" : { - "item" : "netherrocks:dragonstone_gem", - "count" : 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_gem_from_blasting.json b/src/main/resources/data/netherrocks/recipes/dragonstone_gem_from_blasting.json deleted file mode 100644 index aa356275..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_gem_from_blasting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "item": "netherrocks:dragonstone_ore" - }, - "result": "netherrocks:dragonstone_gem", - "experience": 1.0, - "cookingtime": 100 -} diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_gem_from_smelting.json b/src/main/resources/data/netherrocks/recipes/dragonstone_gem_from_smelting.json deleted file mode 100644 index 46864f97..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_gem_from_smelting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "netherrocks:dragonstone_ore" - }, - "result": "netherrocks:dragonstone_gem", - "experience": 1.0, - "cookingtime": 200 -} diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_helmet.json b/src/main/resources/data/netherrocks/recipes/dragonstone_helmet.json deleted file mode 100644 index 8341ce53..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_helmet.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_helmet" - }, - "pattern" : [ - "SSS", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_hoe.json b/src/main/resources/data/netherrocks/recipes/dragonstone_hoe.json deleted file mode 100644 index f260d907..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_hoe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_hoe" - }, - "pattern" : [ - "SS ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_leggings.json b/src/main/resources/data/netherrocks/recipes/dragonstone_leggings.json deleted file mode 100644 index 287e988d..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_leggings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_leggings" - }, - "pattern" : [ - "SSS", - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_pickaxe.json b/src/main/resources/data/netherrocks/recipes/dragonstone_pickaxe.json deleted file mode 100644 index caa623e4..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_pickaxe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_pickaxe" - }, - "pattern" : [ - "SSS", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_shovel.json b/src/main/resources/data/netherrocks/recipes/dragonstone_shovel.json deleted file mode 100644 index 9a92d3ee..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_shovel.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_shovel" - }, - "pattern" : [ - " S ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_sword.json b/src/main/resources/data/netherrocks/recipes/dragonstone_sword.json deleted file mode 100644 index 1efee330..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_sword.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_sword" - }, - "pattern" : [ - " S ", - " S ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_axe.json b/src/main/resources/data/netherrocks/recipes/fyrite_axe.json deleted file mode 100644 index ab34f471..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_axe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_axe" - }, - "pattern" : [ - "SS ", - "ST ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_block.json b/src/main/resources/data/netherrocks/recipes/fyrite_block.json deleted file mode 100644 index e7ce0c36..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "type" : "minecraft:crafting_shaped", - "result" : { - "item" : "netherrocks:fyrite_block" - }, - "pattern" : [ - "SSS", - "SSS", - "SSS" - ], - "key" : { - "S" : { "item" : "netherrocks:fyrite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_boots.json b/src/main/resources/data/netherrocks/recipes/fyrite_boots.json deleted file mode 100644 index 6e5e5068..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_boots.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_boots" - }, - "pattern" : [ - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_chestplate.json b/src/main/resources/data/netherrocks/recipes/fyrite_chestplate.json deleted file mode 100644 index 54554d8f..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_chestplate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_chestplate" - }, - "pattern" : [ - "S S", - "SSS", - "SSS" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_helmet.json b/src/main/resources/data/netherrocks/recipes/fyrite_helmet.json deleted file mode 100644 index 387bc42b..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_helmet.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_helmet" - }, - "pattern" : [ - "SSS", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_ingot.json b/src/main/resources/data/netherrocks/recipes/fyrite_ingot.json deleted file mode 100644 index 57d0bdc7..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_ingot.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "type" : "minecraft:crafting_shapeless", - "ingredients" : [ - { "item" : "netherrocks:fyrite_block" } - ], - "result" : { - "item" : "netherrocks:fyrite_ingot", - "count" : 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_nuggets.json b/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_nuggets.json deleted file mode 100644 index 79759ae3..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_nuggets.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "fyrite_ingot", - "pattern": [ - "###", - "###", - "###" - ], - "key": { - "#": { - "item": "netherrocks:fyrite_nugget" - } - }, - "result": { - "item": "netherrocks:fyrite_ingot" - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_leggings.json b/src/main/resources/data/netherrocks/recipes/fyrite_leggings.json deleted file mode 100644 index e89543dd..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_leggings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_leggings" - }, - "pattern" : [ - "SSS", - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_nugget.json b/src/main/resources/data/netherrocks/recipes/fyrite_nugget.json deleted file mode 100644 index 40a86c32..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_nugget.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "netherrocks:fyrite_ingot" - } - ], - "result": { - "item": "netherrocks:fyrite_nugget", - "count": 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_nugget_from_blasting.json b/src/main/resources/data/netherrocks/recipes/fyrite_nugget_from_blasting.json deleted file mode 100644 index 0929179c..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_nugget_from_blasting.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": [ - { - "item": "netherrocks:fyrite_axe" - }, - { - "item": "netherrocks:fyrite_boots" - }, - { - "item": "netherrocks:fyrite_chestplate" - }, - { - "item": "netherrocks:fyrite_helmet" - }, - { - "item": "netherrocks:fyrite_leggings" - }, - { - "item": "netherrocks:fyrite_pickaxe" - }, - { - "item": "netherrocks:fyrite_shovel" - }, - { - "item": "netherrocks:fyrite_sword" - } - ], - "result": "netherrocks:fyrite_nugget", - "experience": 0.3, - "cookingtime": 100 -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_nugget_from_smelting.json b/src/main/resources/data/netherrocks/recipes/fyrite_nugget_from_smelting.json deleted file mode 100644 index 5016453d..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_nugget_from_smelting.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": [ - { - "item": "netherrocks:fyrite_axe" - }, - { - "item": "netherrocks:fyrite_boots" - }, - { - "item": "netherrocks:fyrite_chestplate" - }, - { - "item": "netherrocks:fyrite_helmet" - }, - { - "item": "netherrocks:fyrite_leggings" - }, - { - "item": "netherrocks:fyrite_pickaxe" - }, - { - "item": "netherrocks:fyrite_shovel" - }, - { - "item": "netherrocks:fyrite_sword" - } - ], - "result": "netherrocks:fyrite_nugget", - "experience": 0.3, - "cookingtime": 200 -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_pickaxe.json b/src/main/resources/data/netherrocks/recipes/fyrite_pickaxe.json deleted file mode 100644 index e0a5a69d..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_pickaxe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_pickaxe" - }, - "pattern" : [ - "SSS", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_shovel.json b/src/main/resources/data/netherrocks/recipes/fyrite_shovel.json deleted file mode 100644 index 3a424e40..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_shovel.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_shovel" - }, - "pattern" : [ - " S ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_sword.json b/src/main/resources/data/netherrocks/recipes/fyrite_sword.json deleted file mode 100644 index 0e2f1c27..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_sword.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_sword" - }, - "pattern" : [ - " S ", - " S ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_block.json b/src/main/resources/data/netherrocks/recipes/illumenite_block.json deleted file mode 100644 index 54f72ddb..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "type" : "minecraft:crafting_shaped", - "result" : { - "item" : "netherrocks:illumenite_block" - }, - "pattern" : [ - "SSS", - "SSS", - "SSS" - ], - "key" : { - "S" : { "item" : "netherrocks:illumenite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_boots.json b/src/main/resources/data/netherrocks/recipes/illumenite_boots.json deleted file mode 100644 index 570b33c0..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_boots.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:illumenite_boots" - }, - "pattern" : [ - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "item" : "netherrocks:illumenite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_chestplate.json b/src/main/resources/data/netherrocks/recipes/illumenite_chestplate.json deleted file mode 100644 index 7f6d882c..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_chestplate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:illumenite_chestplate" - }, - "pattern" : [ - "S S", - "SSS", - "SSS" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "item" : "netherrocks:illumenite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_helmet.json b/src/main/resources/data/netherrocks/recipes/illumenite_helmet.json deleted file mode 100644 index 0ffc1b68..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_helmet.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:illumenite_helmet" - }, - "pattern" : [ - "SSS", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "item" : "netherrocks:illumenite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_ingot.json b/src/main/resources/data/netherrocks/recipes/illumenite_ingot.json deleted file mode 100644 index b881dc34..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_ingot.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "type" : "minecraft:crafting_shapeless", - "ingredients" : [ - { "item" : "netherrocks:illumenite_block" } - ], - "result" : { - "item" : "netherrocks:illumenite_ingot", - "count" : 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_nuggets.json b/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_nuggets.json deleted file mode 100644 index ceab67bd..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_nuggets.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "illumenite_ingot", - "pattern": [ - "###", - "###", - "###" - ], - "key": { - "#": { - "item": "netherrocks:illumenite_nugget" - } - }, - "result": { - "item": "netherrocks:illumenite_ingot" - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_leggings.json b/src/main/resources/data/netherrocks/recipes/illumenite_leggings.json deleted file mode 100644 index d392a0a0..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_leggings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:illumenite_leggings" - }, - "pattern" : [ - "SSS", - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "item" : "netherrocks:illumenite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_nugget.json b/src/main/resources/data/netherrocks/recipes/illumenite_nugget.json deleted file mode 100644 index 8e3f295c..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_nugget.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "netherrocks:illumenite_ingot" - } - ], - "result": { - "item": "netherrocks:illumenite_nugget", - "count": 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_nugget_from_blasting.json b/src/main/resources/data/netherrocks/recipes/illumenite_nugget_from_blasting.json deleted file mode 100644 index e6f46722..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_nugget_from_blasting.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": [ - { - "item": "netherrocks:illumenite_boots" - }, - { - "item": "netherrocks:illumenite_chestplate" - }, - { - "item": "netherrocks:illumenite_helmet" - }, - { - "item": "netherrocks:illumenite_leggings" - }, - { - "item": "netherrocks:illumenite_sword" - } - ], - "result": "netherrocks:illumenite_nugget", - "experience": 0.3, - "cookingtime": 100 -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_nugget_from_smelting.json b/src/main/resources/data/netherrocks/recipes/illumenite_nugget_from_smelting.json deleted file mode 100644 index fc8eb3a5..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_nugget_from_smelting.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": [ - { - "item": "netherrocks:illumenite_boots" - }, - { - "item": "netherrocks:illumenite_chestplate" - }, - { - "item": "netherrocks:illumenite_helmet" - }, - { - "item": "netherrocks:illumenite_leggings" - }, - { - "item": "netherrocks:illumenite_sword" - } - ], - "result": "netherrocks:illumenite_nugget", - "experience": 0.3, - "cookingtime": 200 -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_sword.json b/src/main/resources/data/netherrocks/recipes/illumenite_sword.json deleted file mode 100644 index e1aa741a..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_sword.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:illumenite_sword" - }, - "pattern" : [ - " S ", - " S ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "item" : "netherrocks:illumenite_ingot"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_axe.json b/src/main/resources/data/netherrocks/recipes/malachite_axe.json deleted file mode 100644 index cd48d9e1..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_axe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_axe" - }, - "pattern" : [ - "SS ", - "ST ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_block.json b/src/main/resources/data/netherrocks/recipes/malachite_block.json deleted file mode 100644 index 0b8d2a8c..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "type" : "minecraft:crafting_shaped", - "result" : { - "item" : "netherrocks:malachite_block" - }, - "pattern" : [ - "SSS", - "SSS", - "SSS" - ], - "key" : { - "S" : { "item" : "netherrocks:malachite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_boots.json b/src/main/resources/data/netherrocks/recipes/malachite_boots.json deleted file mode 100644 index e14174b3..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_boots.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_boots" - }, - "pattern" : [ - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_chestplate.json b/src/main/resources/data/netherrocks/recipes/malachite_chestplate.json deleted file mode 100644 index 32020417..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_chestplate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_chestplate" - }, - "pattern" : [ - "S S", - "SSS", - "SSS" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_helmet.json b/src/main/resources/data/netherrocks/recipes/malachite_helmet.json deleted file mode 100644 index 7fba04dc..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_helmet.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_helmet" - }, - "pattern" : [ - "SSS", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_hoe.json b/src/main/resources/data/netherrocks/recipes/malachite_hoe.json deleted file mode 100644 index 93c27a1a..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_hoe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_hoe" - }, - "pattern" : [ - "SS ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_ingot.json b/src/main/resources/data/netherrocks/recipes/malachite_ingot.json deleted file mode 100644 index 641804eb..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_ingot.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "type" : "minecraft:crafting_shapeless", - "ingredients" : [ - { "item" : "netherrocks:malachite_block" } - ], - "result" : { - "item" : "netherrocks:malachite_ingot", - "count" : 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_nuggets.json b/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_nuggets.json deleted file mode 100644 index bb3bc598..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_nuggets.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "malachite_ingot", - "pattern": [ - "###", - "###", - "###" - ], - "key": { - "#": { - "item": "netherrocks:malachite_nugget" - } - }, - "result": { - "item": "netherrocks:malachite_ingot" - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_leggings.json b/src/main/resources/data/netherrocks/recipes/malachite_leggings.json deleted file mode 100644 index c0ea4bf0..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_leggings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_leggings" - }, - "pattern" : [ - "SSS", - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_nugget.json b/src/main/resources/data/netherrocks/recipes/malachite_nugget.json deleted file mode 100644 index 95e389c4..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_nugget.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "netherrocks:malachite_ingot" - } - ], - "result": { - "item": "netherrocks:malachite_nugget", - "count": 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_nugget_from_blasting.json b/src/main/resources/data/netherrocks/recipes/malachite_nugget_from_blasting.json deleted file mode 100644 index b87a2b26..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_nugget_from_blasting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": [ - { - "item": "netherrocks:malachite_axe" - }, - { - "item": "netherrocks:malachite_boots" - }, - { - "item": "netherrocks:malachite_chestplate" - }, - { - "item": "netherrocks:malachite_helmet" - }, - { - "item": "netherrocks:malachite_hoe" - }, - { - "item": "netherrocks:malachite_leggings" - }, - { - "item": "netherrocks:malachite_pickaxe" - }, - { - "item": "netherrocks:malachite_shovel" - }, - { - "item": "netherrocks:malachite_sword" - } - ], - "result": "netherrocks:malachite_nugget", - "experience": 0.3, - "cookingtime": 100 -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_nugget_from_smelting.json b/src/main/resources/data/netherrocks/recipes/malachite_nugget_from_smelting.json deleted file mode 100644 index 52f2d02a..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_nugget_from_smelting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": [ - { - "item": "netherrocks:malachite_axe" - }, - { - "item": "netherrocks:malachite_boots" - }, - { - "item": "netherrocks:malachite_chestplate" - }, - { - "item": "netherrocks:malachite_helmet" - }, - { - "item": "netherrocks:malachite_hoe" - }, - { - "item": "netherrocks:malachite_leggings" - }, - { - "item": "netherrocks:malachite_pickaxe" - }, - { - "item": "netherrocks:malachite_shovel" - }, - { - "item": "netherrocks:malachite_sword" - } - ], - "result": "netherrocks:malachite_nugget", - "experience": 0.3, - "cookingtime": 200 -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_pickaxe.json b/src/main/resources/data/netherrocks/recipes/malachite_pickaxe.json deleted file mode 100644 index f8298ba7..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_pickaxe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_pickaxe" - }, - "pattern" : [ - "SSS", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_shovel.json b/src/main/resources/data/netherrocks/recipes/malachite_shovel.json deleted file mode 100644 index 702f9498..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_shovel.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_shovel" - }, - "pattern" : [ - " S ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_sword.json b/src/main/resources/data/netherrocks/recipes/malachite_sword.json deleted file mode 100644 index 46ee432e..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_sword.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_sword" - }, - "pattern" : [ - " S ", - " S ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/nether_blast_furnace.json b/src/main/resources/data/netherrocks/recipes/nether_blast_furnace.json deleted file mode 100644 index c0a23a2d..00000000 --- a/src/main/resources/data/netherrocks/recipes/nether_blast_furnace.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "III", - "IXI", - "###" - ], - "key": { - "#": { - "item": "minecraft:nether_brick" - }, - "X": { - "item": "netherrocks:nether_furnace" - }, - "I": { - "tag" : "forge:ingots/iron" - } - }, - "result": { - "item": "netherrocks:nether_blast_furnace" - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/nether_furnace.json b/src/main/resources/data/netherrocks/recipes/nether_furnace.json deleted file mode 100644 index 755542fd..00000000 --- a/src/main/resources/data/netherrocks/recipes/nether_furnace.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "result" : { - "item" : "netherrocks:nether_furnace" - }, - "pattern" : [ - "SSS", - "SYS", - "SSS" - ], - "key" : { - "S" : { "item" : "minecraft:netherrack"}, - "Y" : { "item" : "minecraft:flint_and_steel"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/nether_smoker.json b/src/main/resources/data/netherrocks/recipes/nether_smoker.json deleted file mode 100644 index 3316ae72..00000000 --- a/src/main/resources/data/netherrocks/recipes/nether_smoker.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " # ", - "#X#", - " # " - ], - "key": { - "#": { - "tag": "minecraft:logs" - }, - "X": { - "item": "netherrocks:nether_furnace" - } - }, - "result": { - "item": "netherrocks:nether_smoker" - } -} \ No newline at end of file From e07ac56af7515917088e20df850b1150dd65bde0 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Thu, 9 Sep 2021 19:40:24 -0500 Subject: [PATCH 47/56] added generated recipes and recipe advancements --- .../recipes/netherrocks/argonite_axe.json | 34 ++++++++++++++++++ .../recipes/netherrocks/argonite_block.json | 34 ++++++++++++++++++ .../recipes/netherrocks/argonite_hoe.json | 34 ++++++++++++++++++ .../recipes/netherrocks/argonite_ingot.json | 34 ++++++++++++++++++ .../argonite_ingot_from_nuggets.json | 34 ++++++++++++++++++ .../recipes/netherrocks/argonite_nugget.json | 34 ++++++++++++++++++ .../argonite_nugget_from_blasting.json | 34 ++++++++++++++++++ .../argonite_nugget_from_smelting.json | 34 ++++++++++++++++++ .../recipes/netherrocks/argonite_pickaxe.json | 34 ++++++++++++++++++ .../recipes/netherrocks/argonite_shovel.json | 34 ++++++++++++++++++ .../recipes/netherrocks/argonite_sword.json | 34 ++++++++++++++++++ .../recipes/netherrocks/ashstone_axe.json | 34 ++++++++++++++++++ .../recipes/netherrocks/ashstone_block.json | 34 ++++++++++++++++++ .../recipes/netherrocks/ashstone_gem.json | 34 ++++++++++++++++++ .../ashstone_gem_from_blasting_from_ore.json | 34 ++++++++++++++++++ .../ashstone_gem_from_smelting_from_ore.json | 34 ++++++++++++++++++ .../recipes/netherrocks/ashstone_hoe.json | 34 ++++++++++++++++++ .../recipes/netherrocks/ashstone_pickaxe.json | 34 ++++++++++++++++++ .../recipes/netherrocks/ashstone_shovel.json | 34 ++++++++++++++++++ .../recipes/netherrocks/ashstone_sword.json | 34 ++++++++++++++++++ .../recipes/netherrocks/dragonstone_axe.json | 34 ++++++++++++++++++ .../netherrocks/dragonstone_block.json | 34 ++++++++++++++++++ .../netherrocks/dragonstone_boots.json | 34 ++++++++++++++++++ .../netherrocks/dragonstone_chestplate.json | 34 ++++++++++++++++++ .../recipes/netherrocks/dragonstone_gem.json | 34 ++++++++++++++++++ ...ragonstone_gem_from_blasting_from_ore.json | 34 ++++++++++++++++++ ...ragonstone_gem_from_smelting_from_ore.json | 34 ++++++++++++++++++ .../netherrocks/dragonstone_helmet.json | 34 ++++++++++++++++++ .../recipes/netherrocks/dragonstone_hoe.json | 34 ++++++++++++++++++ .../netherrocks/dragonstone_leggings.json | 34 ++++++++++++++++++ .../netherrocks/dragonstone_pickaxe.json | 34 ++++++++++++++++++ .../netherrocks/dragonstone_shovel.json | 34 ++++++++++++++++++ .../netherrocks/dragonstone_sword.json | 34 ++++++++++++++++++ .../recipes/netherrocks/fyrite_axe.json | 34 ++++++++++++++++++ .../recipes/netherrocks/fyrite_block.json | 34 ++++++++++++++++++ .../recipes/netherrocks/fyrite_boots.json | 34 ++++++++++++++++++ .../netherrocks/fyrite_chestplate.json | 34 ++++++++++++++++++ .../recipes/netherrocks/fyrite_helmet.json | 34 ++++++++++++++++++ .../recipes/netherrocks/fyrite_ingot.json | 34 ++++++++++++++++++ .../fyrite_ingot_from_nuggets.json | 34 ++++++++++++++++++ .../recipes/netherrocks/fyrite_leggings.json | 34 ++++++++++++++++++ .../recipes/netherrocks/fyrite_nugget.json | 34 ++++++++++++++++++ .../fyrite_nugget_from_blasting.json | 34 ++++++++++++++++++ .../fyrite_nugget_from_smelting.json | 34 ++++++++++++++++++ .../recipes/netherrocks/fyrite_pickaxe.json | 34 ++++++++++++++++++ .../recipes/netherrocks/fyrite_shovel.json | 34 ++++++++++++++++++ .../recipes/netherrocks/fyrite_sword.json | 34 ++++++++++++++++++ .../recipes/netherrocks/illumenite_block.json | 34 ++++++++++++++++++ .../recipes/netherrocks/illumenite_boots.json | 34 ++++++++++++++++++ .../netherrocks/illumenite_chestplate.json | 34 ++++++++++++++++++ .../netherrocks/illumenite_helmet.json | 34 ++++++++++++++++++ .../recipes/netherrocks/illumenite_ingot.json | 34 ++++++++++++++++++ .../illumenite_ingot_from_nuggets.json | 34 ++++++++++++++++++ .../netherrocks/illumenite_leggings.json | 34 ++++++++++++++++++ .../netherrocks/illumenite_nugget.json | 34 ++++++++++++++++++ .../illumenite_nugget_from_blasting.json | 34 ++++++++++++++++++ .../illumenite_nugget_from_smelting.json | 34 ++++++++++++++++++ .../recipes/netherrocks/illumenite_sword.json | 34 ++++++++++++++++++ .../recipes/netherrocks/malachite_axe.json | 34 ++++++++++++++++++ .../recipes/netherrocks/malachite_block.json | 34 ++++++++++++++++++ .../recipes/netherrocks/malachite_boots.json | 34 ++++++++++++++++++ .../netherrocks/malachite_chestplate.json | 34 ++++++++++++++++++ .../recipes/netherrocks/malachite_helmet.json | 34 ++++++++++++++++++ .../recipes/netherrocks/malachite_hoe.json | 34 ++++++++++++++++++ .../recipes/netherrocks/malachite_ingot.json | 34 ++++++++++++++++++ .../malachite_ingot_from_nuggets.json | 34 ++++++++++++++++++ .../netherrocks/malachite_leggings.json | 34 ++++++++++++++++++ .../recipes/netherrocks/malachite_nugget.json | 34 ++++++++++++++++++ .../malachite_nugget_from_blasting.json | 34 ++++++++++++++++++ .../malachite_nugget_from_smelting.json | 34 ++++++++++++++++++ .../netherrocks/malachite_pickaxe.json | 34 ++++++++++++++++++ .../recipes/netherrocks/malachite_shovel.json | 34 ++++++++++++++++++ .../recipes/netherrocks/malachite_sword.json | 34 ++++++++++++++++++ .../netherrocks/nether_blast_furnace.json | 34 ++++++++++++++++++ .../recipes/netherrocks/nether_furnace.json | 34 ++++++++++++++++++ .../recipes/netherrocks/nether_smoker.json | 34 ++++++++++++++++++ .../netherrocks/recipes/argonite_axe.json | 19 ++++++++++ .../netherrocks/recipes/argonite_block.json | 16 +++++++++ .../netherrocks/recipes/argonite_hoe.json | 19 ++++++++++ .../netherrocks/recipes/argonite_ingot.json | 12 +++++++ .../recipes/argonite_ingot_from_nuggets.json | 16 +++++++++ .../netherrocks/recipes/argonite_nugget.json | 12 +++++++ .../argonite_nugget_from_blasting.json | 23 ++++++++++++ .../argonite_nugget_from_smelting.json | 23 ++++++++++++ .../netherrocks/recipes/argonite_pickaxe.json | 19 ++++++++++ .../netherrocks/recipes/argonite_shovel.json | 19 ++++++++++ .../netherrocks/recipes/argonite_sword.json | 19 ++++++++++ .../netherrocks/recipes/ashstone_axe.json | 19 ++++++++++ .../netherrocks/recipes/ashstone_block.json | 16 +++++++++ .../netherrocks/recipes/ashstone_gem.json | 12 +++++++ .../ashstone_gem_from_blasting_from_ore.json | 9 +++++ .../ashstone_gem_from_smelting_from_ore.json | 9 +++++ .../netherrocks/recipes/ashstone_hoe.json | 19 ++++++++++ .../netherrocks/recipes/ashstone_pickaxe.json | 19 ++++++++++ .../netherrocks/recipes/ashstone_shovel.json | 19 ++++++++++ .../netherrocks/recipes/ashstone_sword.json | 19 ++++++++++ .../netherrocks/recipes/dragonstone_axe.json | 19 ++++++++++ .../recipes/dragonstone_block.json | 16 +++++++++ .../recipes/dragonstone_boots.json | 16 +++++++++ .../recipes/dragonstone_chestplate.json | 16 +++++++++ .../netherrocks/recipes/dragonstone_gem.json | 12 +++++++ ...ragonstone_gem_from_blasting_from_ore.json | 9 +++++ ...ragonstone_gem_from_smelting_from_ore.json | 9 +++++ .../recipes/dragonstone_helmet.json | 16 +++++++++ .../netherrocks/recipes/dragonstone_hoe.json | 19 ++++++++++ .../recipes/dragonstone_leggings.json | 16 +++++++++ .../recipes/dragonstone_pickaxe.json | 19 ++++++++++ .../recipes/dragonstone_shovel.json | 19 ++++++++++ .../recipes/dragonstone_sword.json | 19 ++++++++++ .../data/netherrocks/recipes/fyrite_axe.json | 19 ++++++++++ .../netherrocks/recipes/fyrite_block.json | 16 +++++++++ .../netherrocks/recipes/fyrite_boots.json | 16 +++++++++ .../recipes/fyrite_chestplate.json | 16 +++++++++ .../netherrocks/recipes/fyrite_helmet.json | 16 +++++++++ .../netherrocks/recipes/fyrite_ingot.json | 12 +++++++ .../recipes/fyrite_ingot_from_nuggets.json | 16 +++++++++ .../netherrocks/recipes/fyrite_leggings.json | 16 +++++++++ .../netherrocks/recipes/fyrite_nugget.json | 12 +++++++ .../recipes/fyrite_nugget_from_blasting.json | 32 +++++++++++++++++ .../recipes/fyrite_nugget_from_smelting.json | 32 +++++++++++++++++ .../netherrocks/recipes/fyrite_pickaxe.json | 19 ++++++++++ .../netherrocks/recipes/fyrite_shovel.json | 19 ++++++++++ .../netherrocks/recipes/fyrite_sword.json | 19 ++++++++++ .../netherrocks/recipes/illumenite_block.json | 16 +++++++++ .../netherrocks/recipes/illumenite_boots.json | 16 +++++++++ .../recipes/illumenite_chestplate.json | 16 +++++++++ .../recipes/illumenite_helmet.json | 16 +++++++++ .../netherrocks/recipes/illumenite_ingot.json | 12 +++++++ .../illumenite_ingot_from_nuggets.json | 16 +++++++++ .../recipes/illumenite_leggings.json | 16 +++++++++ .../recipes/illumenite_nugget.json | 12 +++++++ .../illumenite_nugget_from_blasting.json | 23 ++++++++++++ .../illumenite_nugget_from_smelting.json | 23 ++++++++++++ .../netherrocks/recipes/illumenite_sword.json | 19 ++++++++++ .../netherrocks/recipes/malachite_axe.json | 19 ++++++++++ .../netherrocks/recipes/malachite_block.json | 16 +++++++++ .../netherrocks/recipes/malachite_boots.json | 16 +++++++++ .../recipes/malachite_chestplate.json | 16 +++++++++ .../netherrocks/recipes/malachite_helmet.json | 16 +++++++++ .../netherrocks/recipes/malachite_hoe.json | 19 ++++++++++ .../netherrocks/recipes/malachite_ingot.json | 12 +++++++ .../recipes/malachite_ingot_from_nuggets.json | 16 +++++++++ .../recipes/malachite_leggings.json | 16 +++++++++ .../netherrocks/recipes/malachite_nugget.json | 12 +++++++ .../malachite_nugget_from_blasting.json | 35 +++++++++++++++++++ .../malachite_nugget_from_smelting.json | 35 +++++++++++++++++++ .../recipes/malachite_pickaxe.json | 19 ++++++++++ .../netherrocks/recipes/malachite_shovel.json | 19 ++++++++++ .../netherrocks/recipes/malachite_sword.json | 19 ++++++++++ .../recipes/nether_blast_furnace.json | 22 ++++++++++++ .../netherrocks/recipes/nether_furnace.json | 19 ++++++++++ .../netherrocks/recipes/nether_smoker.json | 19 ++++++++++ 152 files changed, 3917 insertions(+) create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_axe.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_block.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_hoe.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_nuggets.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_pickaxe.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_shovel.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_sword.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_axe.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_block.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem_from_blasting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem_from_smelting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_hoe.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_pickaxe.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_shovel.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_sword.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_axe.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_block.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_boots.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_chestplate.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem_from_blasting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem_from_smelting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_helmet.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_hoe.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_leggings.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_pickaxe.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_shovel.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_sword.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_axe.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_block.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_boots.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_chestplate.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_helmet.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_nuggets.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_leggings.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_pickaxe.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_shovel.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_sword.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_block.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_boots.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_chestplate.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_helmet.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_nuggets.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_leggings.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_sword.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_axe.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_block.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_boots.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_chestplate.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_helmet.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_hoe.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_nuggets.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_leggings.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_pickaxe.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_shovel.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_sword.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_blast_furnace.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_furnace.json create mode 100644 src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_smoker.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_axe.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_block.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_hoe.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_ingot.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_nuggets.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_nugget.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_nugget_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_nugget_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_pickaxe.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_shovel.json create mode 100644 src/generated/resources/data/netherrocks/recipes/argonite_sword.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_axe.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_block.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_gem.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_gem_from_blasting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_gem_from_smelting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_hoe.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_pickaxe.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_shovel.json create mode 100644 src/generated/resources/data/netherrocks/recipes/ashstone_sword.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_axe.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_block.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_boots.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_chestplate.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_gem.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_gem_from_blasting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_gem_from_smelting_from_ore.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_helmet.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_hoe.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_leggings.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_pickaxe.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_shovel.json create mode 100644 src/generated/resources/data/netherrocks/recipes/dragonstone_sword.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_axe.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_block.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_boots.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_chestplate.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_helmet.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_ingot.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_nuggets.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_leggings.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_nugget.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_nugget_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_nugget_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_pickaxe.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_shovel.json create mode 100644 src/generated/resources/data/netherrocks/recipes/fyrite_sword.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_block.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_boots.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_chestplate.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_helmet.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_ingot.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_nuggets.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_leggings.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_nugget.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_nugget_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_nugget_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/illumenite_sword.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_axe.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_block.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_boots.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_chestplate.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_helmet.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_hoe.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_ingot.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_nuggets.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_leggings.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_nugget.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_nugget_from_blasting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_nugget_from_smelting.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_pickaxe.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_shovel.json create mode 100644 src/generated/resources/data/netherrocks/recipes/malachite_sword.json create mode 100644 src/generated/resources/data/netherrocks/recipes/nether_blast_furnace.json create mode 100644 src/generated/resources/data/netherrocks/recipes/nether_furnace.json create mode 100644 src/generated/resources/data/netherrocks/recipes/nether_smoker.json diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_axe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_axe.json new file mode 100644 index 00000000..dddbb1a7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_axe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_axe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_axe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_block.json new file mode 100644 index 00000000..5e0c4901 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_hoe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_hoe.json new file mode 100644 index 00000000..e2da4539 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_hoe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_hoe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_hoe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot.json new file mode 100644 index 00000000..95b22558 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_ingot" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_ingot" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_nuggets.json new file mode 100644 index 00000000..37134c81 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_nuggets.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_ingot_from_nuggets" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_ingot_from_nuggets" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget.json new file mode 100644 index 00000000..db9dcca9 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_nugget" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_nugget" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget_from_blasting.json new file mode 100644 index 00000000..5b3e535f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_nugget_from_blasting" + ] + }, + "criteria": { + "argonite_nugget_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_axe" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_nugget_from_blasting" + } + } + }, + "requirements": [ + [ + "argonite_nugget_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget_from_smelting.json new file mode 100644 index 00000000..45ab11ed --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_nugget_from_smelting" + ] + }, + "criteria": { + "argonite_nugget_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_axe" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_nugget_from_smelting" + } + } + }, + "requirements": [ + [ + "argonite_nugget_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_pickaxe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_pickaxe.json new file mode 100644 index 00000000..22f25fb6 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_pickaxe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_pickaxe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_pickaxe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_shovel.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_shovel.json new file mode 100644 index 00000000..837b8f1c --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_shovel.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_shovel" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_shovel" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_sword.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_sword.json new file mode 100644 index 00000000..eace2315 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_sword.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_sword" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_sword" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_axe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_axe.json new file mode 100644 index 00000000..5ef57185 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_axe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_axe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_axe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_block.json new file mode 100644 index 00000000..68af14cc --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem.json new file mode 100644 index 00000000..fa4d337f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_gem" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_gem" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem_from_blasting_from_ore.json new file mode 100644 index 00000000..3e86229d --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem_from_blasting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_gem_from_blasting_from_ore" + ] + }, + "criteria": { + "ashstone_gem_from_blasting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_gem_from_blasting_from_ore" + } + } + }, + "requirements": [ + [ + "ashstone_gem_from_blasting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem_from_smelting_from_ore.json new file mode 100644 index 00000000..c5038442 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem_from_smelting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_gem_from_smelting_from_ore" + ] + }, + "criteria": { + "ashstone_gem_from_smelting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_gem_from_smelting_from_ore" + } + } + }, + "requirements": [ + [ + "ashstone_gem_from_smelting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_hoe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_hoe.json new file mode 100644 index 00000000..42c35fa9 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_hoe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_hoe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_hoe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_pickaxe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_pickaxe.json new file mode 100644 index 00000000..b7e842d2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_pickaxe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_pickaxe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_pickaxe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_shovel.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_shovel.json new file mode 100644 index 00000000..d8d55a33 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_shovel.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_shovel" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_shovel" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_sword.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_sword.json new file mode 100644 index 00000000..a6c29dcf --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_sword.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_sword" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_sword" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_axe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_axe.json new file mode 100644 index 00000000..764692ce --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_axe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_axe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_axe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_block.json new file mode 100644 index 00000000..259d2c3f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_boots.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_boots.json new file mode 100644 index 00000000..1d0c14d0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_boots.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_boots" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_boots" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_chestplate.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_chestplate.json new file mode 100644 index 00000000..b4d9d4da --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_chestplate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_chestplate" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_chestplate" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem.json new file mode 100644 index 00000000..54ee8c94 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_gem" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_gem" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem_from_blasting_from_ore.json new file mode 100644 index 00000000..2207697c --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem_from_blasting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_gem_from_blasting_from_ore" + ] + }, + "criteria": { + "dragonstone_gem_from_blasting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_gem_from_blasting_from_ore" + } + } + }, + "requirements": [ + [ + "dragonstone_gem_from_blasting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem_from_smelting_from_ore.json new file mode 100644 index 00000000..1ba52d3c --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem_from_smelting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_gem_from_smelting_from_ore" + ] + }, + "criteria": { + "dragonstone_gem_from_smelting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_gem_from_smelting_from_ore" + } + } + }, + "requirements": [ + [ + "dragonstone_gem_from_smelting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_helmet.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_helmet.json new file mode 100644 index 00000000..26de5ce0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_helmet.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_helmet" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_helmet" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_hoe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_hoe.json new file mode 100644 index 00000000..7eaf3030 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_hoe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_hoe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_hoe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_leggings.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_leggings.json new file mode 100644 index 00000000..600049c8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_leggings.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_leggings" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_leggings" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_pickaxe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_pickaxe.json new file mode 100644 index 00000000..dd0534d5 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_pickaxe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_pickaxe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_pickaxe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_shovel.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_shovel.json new file mode 100644 index 00000000..5b6c58f2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_shovel.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_shovel" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_shovel" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_sword.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_sword.json new file mode 100644 index 00000000..20645b80 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_sword.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_sword" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_sword" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_axe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_axe.json new file mode 100644 index 00000000..c33788fb --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_axe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_axe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_axe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_block.json new file mode 100644 index 00000000..01fa4f34 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_boots.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_boots.json new file mode 100644 index 00000000..7b6eaed8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_boots.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_boots" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_boots" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_chestplate.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_chestplate.json new file mode 100644 index 00000000..456ededd --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_chestplate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_chestplate" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_chestplate" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_helmet.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_helmet.json new file mode 100644 index 00000000..3c50cca4 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_helmet.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_helmet" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_helmet" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot.json new file mode 100644 index 00000000..a2c2874d --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_ingot" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_ingot" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_nuggets.json new file mode 100644 index 00000000..6b019413 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_nuggets.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_ingot_from_nuggets" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_ingot_from_nuggets" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_leggings.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_leggings.json new file mode 100644 index 00000000..8d93c89d --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_leggings.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_leggings" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_leggings" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget.json new file mode 100644 index 00000000..c9781f46 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_nugget" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_nugget" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget_from_blasting.json new file mode 100644 index 00000000..969b8e9f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_nugget_from_blasting" + ] + }, + "criteria": { + "fyrite_nugget_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_axe" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_nugget_from_blasting" + } + } + }, + "requirements": [ + [ + "fyrite_nugget_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget_from_smelting.json new file mode 100644 index 00000000..0a7d95cd --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_nugget_from_smelting" + ] + }, + "criteria": { + "fyrite_nugget_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_axe" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_nugget_from_smelting" + } + } + }, + "requirements": [ + [ + "fyrite_nugget_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_pickaxe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_pickaxe.json new file mode 100644 index 00000000..16542a2f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_pickaxe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_pickaxe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_pickaxe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_shovel.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_shovel.json new file mode 100644 index 00000000..4b968841 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_shovel.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_shovel" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_shovel" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_sword.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_sword.json new file mode 100644 index 00000000..a51f93f1 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_sword.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_sword" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_sword" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_block.json new file mode 100644 index 00000000..98c66629 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_boots.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_boots.json new file mode 100644 index 00000000..aa5ffb7f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_boots.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_boots" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_boots" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_chestplate.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_chestplate.json new file mode 100644 index 00000000..af58c35e --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_chestplate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_chestplate" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_chestplate" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_helmet.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_helmet.json new file mode 100644 index 00000000..bb34cc9d --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_helmet.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_helmet" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_helmet" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot.json new file mode 100644 index 00000000..b5005cd9 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_ingot" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_ingot" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_nuggets.json new file mode 100644 index 00000000..e8b1193e --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_nuggets.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_ingot_from_nuggets" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_ingot_from_nuggets" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_leggings.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_leggings.json new file mode 100644 index 00000000..b26a8670 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_leggings.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_leggings" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_leggings" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget.json new file mode 100644 index 00000000..9d3abd65 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_nugget" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_nugget" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget_from_blasting.json new file mode 100644 index 00000000..b1773aab --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_nugget_from_blasting" + ] + }, + "criteria": { + "illumenite_nugget_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_sword" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_nugget_from_blasting" + } + } + }, + "requirements": [ + [ + "illumenite_nugget_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget_from_smelting.json new file mode 100644 index 00000000..e00ff969 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_nugget_from_smelting" + ] + }, + "criteria": { + "illumenite_nugget_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_sword" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_nugget_from_smelting" + } + } + }, + "requirements": [ + [ + "illumenite_nugget_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_sword.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_sword.json new file mode 100644 index 00000000..8bcccdf0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_sword.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_sword" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_sword" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_axe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_axe.json new file mode 100644 index 00000000..4f0f46c2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_axe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_axe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_axe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_block.json new file mode 100644 index 00000000..e5359380 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_boots.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_boots.json new file mode 100644 index 00000000..ea289fb7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_boots.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_boots" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_boots" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_chestplate.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_chestplate.json new file mode 100644 index 00000000..0e8e7d94 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_chestplate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_chestplate" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_chestplate" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_helmet.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_helmet.json new file mode 100644 index 00000000..a8f7618a --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_helmet.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_helmet" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_helmet" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_hoe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_hoe.json new file mode 100644 index 00000000..bdaaf6d6 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_hoe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_hoe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_hoe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot.json new file mode 100644 index 00000000..19392ab8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_ingot" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_ingot" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_nuggets.json new file mode 100644 index 00000000..0799bb15 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_nuggets.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_ingot_from_nuggets" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_ingot_from_nuggets" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_leggings.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_leggings.json new file mode 100644 index 00000000..251f5cdd --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_leggings.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_leggings" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_leggings" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget.json new file mode 100644 index 00000000..ad1d7ef5 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_nugget" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_nugget" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget_from_blasting.json new file mode 100644 index 00000000..2fd24296 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_nugget_from_blasting" + ] + }, + "criteria": { + "malachite_nugget_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_axe" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_nugget_from_blasting" + } + } + }, + "requirements": [ + [ + "malachite_nugget_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget_from_smelting.json new file mode 100644 index 00000000..072ae334 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_nugget_from_smelting" + ] + }, + "criteria": { + "malachite_nugget_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_axe" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_nugget_from_smelting" + } + } + }, + "requirements": [ + [ + "malachite_nugget_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_pickaxe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_pickaxe.json new file mode 100644 index 00000000..13708368 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_pickaxe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_pickaxe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_pickaxe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_shovel.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_shovel.json new file mode 100644 index 00000000..cfbe7d3e --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_shovel.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_shovel" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_shovel" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_sword.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_sword.json new file mode 100644 index 00000000..a5901ea5 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_sword.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_sword" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_sword" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_blast_furnace.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_blast_furnace.json new file mode 100644 index 00000000..d5689b29 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_blast_furnace.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:nether_blast_furnace" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:nether_furnace" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:nether_blast_furnace" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_furnace.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_furnace.json new file mode 100644 index 00000000..238b7b4f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_furnace.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:nether_furnace" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:netherrack" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:nether_furnace" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_smoker.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_smoker.json new file mode 100644 index 00000000..c801e817 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_smoker.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:nether_smoker" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:nether_furnace" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:nether_smoker" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_axe.json b/src/generated/resources/data/netherrocks/recipes/argonite_axe.json new file mode 100644 index 00000000..8489f48a --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_axe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + "ST ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:argonite_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_block.json b/src/generated/resources/data/netherrocks/recipes/argonite_block.json new file mode 100644 index 00000000..3a4ae70a --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + } + }, + "result": { + "item": "netherrocks:argonite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_hoe.json b/src/generated/resources/data/netherrocks/recipes/argonite_hoe.json new file mode 100644 index 00000000..1025a2cc --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:argonite_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_ingot.json b/src/generated/resources/data/netherrocks/recipes/argonite_ingot.json new file mode 100644 index 00000000..c36de52c --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_ingot.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:argonite_block" + } + ], + "result": { + "item": "netherrocks:argonite_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_nuggets.json new file mode 100644 index 00000000..218b880d --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_nuggets.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:argonite_nugget" + } + }, + "result": { + "item": "netherrocks:argonite_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_nugget.json b/src/generated/resources/data/netherrocks/recipes/argonite_nugget.json new file mode 100644 index 00000000..2c5e2ba4 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_nugget.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:argonite_ingot" + } + ], + "result": { + "item": "netherrocks:argonite_nugget", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/argonite_nugget_from_blasting.json new file mode 100644 index 00000000..fb7a636f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_nugget_from_blasting.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:blasting", + "ingredient": [ + { + "item": "netherrocks:argonite_axe" + }, + { + "item": "netherrocks:argonite_hoe" + }, + { + "item": "netherrocks:argonite_pickaxe" + }, + { + "item": "netherrocks:argonite_shovel" + }, + { + "item": "netherrocks:argonite_sword" + } + ], + "result": "netherrocks:argonite_nugget", + "experience": 0.3, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/argonite_nugget_from_smelting.json new file mode 100644 index 00000000..fd2c272e --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_nugget_from_smelting.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:smelting", + "ingredient": [ + { + "item": "netherrocks:argonite_axe" + }, + { + "item": "netherrocks:argonite_hoe" + }, + { + "item": "netherrocks:argonite_pickaxe" + }, + { + "item": "netherrocks:argonite_shovel" + }, + { + "item": "netherrocks:argonite_sword" + } + ], + "result": "netherrocks:argonite_nugget", + "experience": 0.3, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_pickaxe.json b/src/generated/resources/data/netherrocks/recipes/argonite_pickaxe.json new file mode 100644 index 00000000..d6cd8560 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:argonite_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_shovel.json b/src/generated/resources/data/netherrocks/recipes/argonite_shovel.json new file mode 100644 index 00000000..e21c6220 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:argonite_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_sword.json b/src/generated/resources/data/netherrocks/recipes/argonite_sword.json new file mode 100644 index 00000000..6e370ede --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " S ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:argonite_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_axe.json b/src/generated/resources/data/netherrocks/recipes/ashstone_axe.json new file mode 100644 index 00000000..c1b5cdb8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_axe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + "ST ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:ashstone_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_block.json b/src/generated/resources/data/netherrocks/recipes/ashstone_block.json new file mode 100644 index 00000000..d646bb62 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + } + }, + "result": { + "item": "netherrocks:ashstone_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_gem.json b/src/generated/resources/data/netherrocks/recipes/ashstone_gem.json new file mode 100644 index 00000000..396798be --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_gem.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:ashstone_block" + } + ], + "result": { + "item": "netherrocks:ashstone_gem", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_gem_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/ashstone_gem_from_blasting_from_ore.json new file mode 100644 index 00000000..0b839386 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_gem_from_blasting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:ashstone_ore" + }, + "result": "netherrocks:ashstone_gem", + "experience": 0.8, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_gem_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/ashstone_gem_from_smelting_from_ore.json new file mode 100644 index 00000000..97138a6a --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_gem_from_smelting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:ashstone_ore" + }, + "result": "netherrocks:ashstone_gem", + "experience": 0.8, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_hoe.json b/src/generated/resources/data/netherrocks/recipes/ashstone_hoe.json new file mode 100644 index 00000000..cec9b17f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:ashstone_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_pickaxe.json b/src/generated/resources/data/netherrocks/recipes/ashstone_pickaxe.json new file mode 100644 index 00000000..42d7431b --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:ashstone_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_shovel.json b/src/generated/resources/data/netherrocks/recipes/ashstone_shovel.json new file mode 100644 index 00000000..e9b8b94c --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:ashstone_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_sword.json b/src/generated/resources/data/netherrocks/recipes/ashstone_sword.json new file mode 100644 index 00000000..49c3ae0d --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " S ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:ashstone_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_axe.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_axe.json new file mode 100644 index 00000000..bddd252f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_axe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + "ST ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:dragonstone_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_block.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_block.json new file mode 100644 index 00000000..6e82c8b3 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_boots.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_boots.json new file mode 100644 index 00000000..23f62fd0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_boots.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_chestplate.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_chestplate.json new file mode 100644 index 00000000..20bd7aeb --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_chestplate.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "S S", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_gem.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_gem.json new file mode 100644 index 00000000..2d30765c --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_gem.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:dragonstone_block" + } + ], + "result": { + "item": "netherrocks:dragonstone_gem", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_gem_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_gem_from_blasting_from_ore.json new file mode 100644 index 00000000..12d52de9 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_gem_from_blasting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:dragonstone_ore" + }, + "result": "netherrocks:dragonstone_gem", + "experience": 0.8, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_gem_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_gem_from_smelting_from_ore.json new file mode 100644 index 00000000..50a34b52 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_gem_from_smelting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:dragonstone_ore" + }, + "result": "netherrocks:dragonstone_gem", + "experience": 0.8, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_helmet.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_helmet.json new file mode 100644 index 00000000..28a37412 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_helmet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + " " + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_hoe.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_hoe.json new file mode 100644 index 00000000..c2be97ac --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:dragonstone_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_leggings.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_leggings.json new file mode 100644 index 00000000..72dd041d --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_leggings.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_pickaxe.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_pickaxe.json new file mode 100644 index 00000000..8ccedee7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:dragonstone_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_shovel.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_shovel.json new file mode 100644 index 00000000..5e1e5aa5 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:dragonstone_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_sword.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_sword.json new file mode 100644 index 00000000..9f185734 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " S ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:dragonstone_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_axe.json b/src/generated/resources/data/netherrocks/recipes/fyrite_axe.json new file mode 100644 index 00000000..65de4970 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_axe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + "ST ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:fyrite_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_block.json b/src/generated/resources/data/netherrocks/recipes/fyrite_block.json new file mode 100644 index 00000000..e08cede9 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_boots.json b/src/generated/resources/data/netherrocks/recipes/fyrite_boots.json new file mode 100644 index 00000000..14347bfa --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_boots.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_chestplate.json b/src/generated/resources/data/netherrocks/recipes/fyrite_chestplate.json new file mode 100644 index 00000000..2c958e2e --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_chestplate.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "S S", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_helmet.json b/src/generated/resources/data/netherrocks/recipes/fyrite_helmet.json new file mode 100644 index 00000000..0b91d4bc --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_helmet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + " " + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_ingot.json b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot.json new file mode 100644 index 00000000..7f1c5775 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:fyrite_block" + } + ], + "result": { + "item": "netherrocks:fyrite_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_nuggets.json new file mode 100644 index 00000000..c9c5d98b --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_nuggets.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_nugget" + } + }, + "result": { + "item": "netherrocks:fyrite_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_leggings.json b/src/generated/resources/data/netherrocks/recipes/fyrite_leggings.json new file mode 100644 index 00000000..32925573 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_leggings.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_nugget.json b/src/generated/resources/data/netherrocks/recipes/fyrite_nugget.json new file mode 100644 index 00000000..40a86c32 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_nugget.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:fyrite_ingot" + } + ], + "result": { + "item": "netherrocks:fyrite_nugget", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/fyrite_nugget_from_blasting.json new file mode 100644 index 00000000..4b5118c2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_nugget_from_blasting.json @@ -0,0 +1,32 @@ +{ + "type": "minecraft:blasting", + "ingredient": [ + { + "item": "netherrocks:fyrite_axe" + }, + { + "item": "netherrocks:fyrite_pickaxe" + }, + { + "item": "netherrocks:fyrite_shovel" + }, + { + "item": "netherrocks:fyrite_boots" + }, + { + "item": "netherrocks:fyrite_sword" + }, + { + "item": "netherrocks:fyrite_chestplate" + }, + { + "item": "netherrocks:fyrite_helmet" + }, + { + "item": "netherrocks:fyrite_leggings" + } + ], + "result": "netherrocks:fyrite_nugget", + "experience": 0.3, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/fyrite_nugget_from_smelting.json new file mode 100644 index 00000000..037c415a --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_nugget_from_smelting.json @@ -0,0 +1,32 @@ +{ + "type": "minecraft:smelting", + "ingredient": [ + { + "item": "netherrocks:fyrite_axe" + }, + { + "item": "netherrocks:fyrite_pickaxe" + }, + { + "item": "netherrocks:fyrite_shovel" + }, + { + "item": "netherrocks:fyrite_boots" + }, + { + "item": "netherrocks:fyrite_sword" + }, + { + "item": "netherrocks:fyrite_chestplate" + }, + { + "item": "netherrocks:fyrite_helmet" + }, + { + "item": "netherrocks:fyrite_leggings" + } + ], + "result": "netherrocks:fyrite_nugget", + "experience": 0.3, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_pickaxe.json b/src/generated/resources/data/netherrocks/recipes/fyrite_pickaxe.json new file mode 100644 index 00000000..8bb77fb2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:fyrite_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_shovel.json b/src/generated/resources/data/netherrocks/recipes/fyrite_shovel.json new file mode 100644 index 00000000..5d08fcca --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:fyrite_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_sword.json b/src/generated/resources/data/netherrocks/recipes/fyrite_sword.json new file mode 100644 index 00000000..574555ff --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " S ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:fyrite_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_block.json b/src/generated/resources/data/netherrocks/recipes/illumenite_block.json new file mode 100644 index 00000000..22c9e6ac --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_boots.json b/src/generated/resources/data/netherrocks/recipes/illumenite_boots.json new file mode 100644 index 00000000..b453ef68 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_boots.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_chestplate.json b/src/generated/resources/data/netherrocks/recipes/illumenite_chestplate.json new file mode 100644 index 00000000..ced77b4b --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_chestplate.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "S S", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_helmet.json b/src/generated/resources/data/netherrocks/recipes/illumenite_helmet.json new file mode 100644 index 00000000..4592bfac --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_helmet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + " " + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_ingot.json b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot.json new file mode 100644 index 00000000..f5a43293 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:illumenite_block" + } + ], + "result": { + "item": "netherrocks:illumenite_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_nuggets.json new file mode 100644 index 00000000..1ba0d20d --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_nuggets.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_nugget" + } + }, + "result": { + "item": "netherrocks:illumenite_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_leggings.json b/src/generated/resources/data/netherrocks/recipes/illumenite_leggings.json new file mode 100644 index 00000000..239170ba --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_leggings.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_nugget.json b/src/generated/resources/data/netherrocks/recipes/illumenite_nugget.json new file mode 100644 index 00000000..8e3f295c --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_nugget.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:illumenite_ingot" + } + ], + "result": { + "item": "netherrocks:illumenite_nugget", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/illumenite_nugget_from_blasting.json new file mode 100644 index 00000000..7904182a --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_nugget_from_blasting.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:blasting", + "ingredient": [ + { + "item": "netherrocks:illumenite_boots" + }, + { + "item": "netherrocks:illumenite_sword" + }, + { + "item": "netherrocks:illumenite_chestplate" + }, + { + "item": "netherrocks:illumenite_helmet" + }, + { + "item": "netherrocks:illumenite_leggings" + } + ], + "result": "netherrocks:illumenite_nugget", + "experience": 0.3, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/illumenite_nugget_from_smelting.json new file mode 100644 index 00000000..f1100273 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_nugget_from_smelting.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:smelting", + "ingredient": [ + { + "item": "netherrocks:illumenite_boots" + }, + { + "item": "netherrocks:illumenite_sword" + }, + { + "item": "netherrocks:illumenite_chestplate" + }, + { + "item": "netherrocks:illumenite_helmet" + }, + { + "item": "netherrocks:illumenite_leggings" + } + ], + "result": "netherrocks:illumenite_nugget", + "experience": 0.3, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_sword.json b/src/generated/resources/data/netherrocks/recipes/illumenite_sword.json new file mode 100644 index 00000000..81e875fa --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " S ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:illumenite_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_axe.json b/src/generated/resources/data/netherrocks/recipes/malachite_axe.json new file mode 100644 index 00000000..acdbf116 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_axe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + "ST ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:malachite_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_block.json b/src/generated/resources/data/netherrocks/recipes/malachite_block.json new file mode 100644 index 00000000..869e0fa3 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_boots.json b/src/generated/resources/data/netherrocks/recipes/malachite_boots.json new file mode 100644 index 00000000..2394fc25 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_boots.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_chestplate.json b/src/generated/resources/data/netherrocks/recipes/malachite_chestplate.json new file mode 100644 index 00000000..04f36f33 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_chestplate.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "S S", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_helmet.json b/src/generated/resources/data/netherrocks/recipes/malachite_helmet.json new file mode 100644 index 00000000..8ee34ef7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_helmet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + " " + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_hoe.json b/src/generated/resources/data/netherrocks/recipes/malachite_hoe.json new file mode 100644 index 00000000..890222dd --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:malachite_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_ingot.json b/src/generated/resources/data/netherrocks/recipes/malachite_ingot.json new file mode 100644 index 00000000..eaa866a0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_ingot.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:malachite_block" + } + ], + "result": { + "item": "netherrocks:malachite_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_nuggets.json new file mode 100644 index 00000000..fd7fb7e7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_nuggets.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_nugget" + } + }, + "result": { + "item": "netherrocks:malachite_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_leggings.json b/src/generated/resources/data/netherrocks/recipes/malachite_leggings.json new file mode 100644 index 00000000..761ea819 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_leggings.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_nugget.json b/src/generated/resources/data/netherrocks/recipes/malachite_nugget.json new file mode 100644 index 00000000..95e389c4 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_nugget.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:malachite_ingot" + } + ], + "result": { + "item": "netherrocks:malachite_nugget", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/malachite_nugget_from_blasting.json new file mode 100644 index 00000000..05e90482 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_nugget_from_blasting.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:blasting", + "ingredient": [ + { + "item": "netherrocks:malachite_axe" + }, + { + "item": "netherrocks:malachite_pickaxe" + }, + { + "item": "netherrocks:malachite_shovel" + }, + { + "item": "netherrocks:malachite_boots" + }, + { + "item": "netherrocks:malachite_sword" + }, + { + "item": "netherrocks:malachite_chestplate" + }, + { + "item": "netherrocks:malachite_helmet" + }, + { + "item": "netherrocks:malachite_leggings" + }, + { + "item": "netherrocks:malachite_hoe" + } + ], + "result": "netherrocks:malachite_nugget", + "experience": 0.3, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/malachite_nugget_from_smelting.json new file mode 100644 index 00000000..14852b27 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_nugget_from_smelting.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:smelting", + "ingredient": [ + { + "item": "netherrocks:malachite_axe" + }, + { + "item": "netherrocks:malachite_pickaxe" + }, + { + "item": "netherrocks:malachite_shovel" + }, + { + "item": "netherrocks:malachite_boots" + }, + { + "item": "netherrocks:malachite_sword" + }, + { + "item": "netherrocks:malachite_chestplate" + }, + { + "item": "netherrocks:malachite_helmet" + }, + { + "item": "netherrocks:malachite_leggings" + }, + { + "item": "netherrocks:malachite_hoe" + } + ], + "result": "netherrocks:malachite_nugget", + "experience": 0.3, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_pickaxe.json b/src/generated/resources/data/netherrocks/recipes/malachite_pickaxe.json new file mode 100644 index 00000000..0cb7488e --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:malachite_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_shovel.json b/src/generated/resources/data/netherrocks/recipes/malachite_shovel.json new file mode 100644 index 00000000..6725d01f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:malachite_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_sword.json b/src/generated/resources/data/netherrocks/recipes/malachite_sword.json new file mode 100644 index 00000000..9b3f678a --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " S ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:malachite_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/nether_blast_furnace.json b/src/generated/resources/data/netherrocks/recipes/nether_blast_furnace.json new file mode 100644 index 00000000..f2aad261 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/nether_blast_furnace.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "III", + "IXI", + "###" + ], + "key": { + "#": { + "item": "minecraft:nether_brick" + }, + "I": { + "item": "minecraft:iron_ingot" + }, + "X": { + "item": "netherrocks:nether_furnace" + } + }, + "result": { + "item": "netherrocks:nether_blast_furnace" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/nether_furnace.json b/src/generated/resources/data/netherrocks/recipes/nether_furnace.json new file mode 100644 index 00000000..cd8f63ce --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/nether_furnace.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SYS", + "SSS" + ], + "key": { + "S": { + "item": "minecraft:netherrack" + }, + "Y": { + "item": "minecraft:flint_and_steel" + } + }, + "result": { + "item": "netherrocks:nether_furnace" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/nether_smoker.json b/src/generated/resources/data/netherrocks/recipes/nether_smoker.json new file mode 100644 index 00000000..3316ae72 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/nether_smoker.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " # ", + "#X#", + " # " + ], + "key": { + "#": { + "tag": "minecraft:logs" + }, + "X": { + "item": "netherrocks:nether_furnace" + } + }, + "result": { + "item": "netherrocks:nether_smoker" + } +} \ No newline at end of file From e7659da4e7b0c0379dfa8b28afac4867641e5679 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 11 Sep 2021 12:21:11 -0500 Subject: [PATCH 48/56] added slabs to lang file; updated forge and simplecore versions --- gradle.properties | 4 ++-- src/main/resources/assets/netherrocks/lang/en_us.json | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 11e719f2..9ae0efc5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,11 +6,11 @@ org.gradle.java.home=/usr/lib/jvm/adoptopenjdk-16-hotspot-amd64 # general version_minecraft = 1.17.1 -version_forge = 1.17.1-37.0.53 +version_forge = 1.17.1-37.0.58 # Simple Ores: Netherrocks version_mod = 3.0.0 -simplecorelib_version = 1.17.1-3.0.3.0 +simplecorelib_version = 1.17.1-3.0.r.0 simpleores_version = 1.17.1-3.0.1.1 version_mcjei = 1.17.1 jei_version = 8.0.0.12 diff --git a/src/main/resources/assets/netherrocks/lang/en_us.json b/src/main/resources/assets/netherrocks/lang/en_us.json index 56563e30..761a848c 100644 --- a/src/main/resources/assets/netherrocks/lang/en_us.json +++ b/src/main/resources/assets/netherrocks/lang/en_us.json @@ -104,6 +104,12 @@ "block.netherrocks.illumenite_bricks": "Illumenite Bricks", "block.netherrocks.dragonstone_bricks": "Dragonstone Bricks", "block.netherrocks.argonite_bricks": "Argonite Bricks", + "block.netherrocks.fyrite_brick_slab": "Fyrite Brick Slab", + "block.netherrocks.malachite_brick_slab": "Malachite Brick Slab", + "block.netherrocks.ashstone_brick_slab": "Ashstone Brick Slab", + "block.netherrocks.illumenite_brick_slab": "Illumenite Brick Slab", + "block.netherrocks.dragonstone_brick_slab": "Dragonstone Brick Slab", + "block.netherrocks.argonite_brick_slab": "Argonite Brick Slab", "block.netherrocks.fyrite_brick_stairs": "Fyrite Brick Stairs", "block.netherrocks.malachite_brick_stairs": "Malachite Brick Stairs", From ec0750b6e5a1d06bd6b3d2e6c8294066ada441f3 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 11 Sep 2021 13:19:07 -0500 Subject: [PATCH 49/56] updated simplecorelib version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9ae0efc5..92bbf6c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ version_forge = 1.17.1-37.0.58 # Simple Ores: Netherrocks version_mod = 3.0.0 -simplecorelib_version = 1.17.1-3.0.r.0 +simplecorelib_version = 1.17.1-3.0.4.0 simpleores_version = 1.17.1-3.0.1.1 version_mcjei = 1.17.1 jei_version = 8.0.0.12 From 5df13927752c9f67bd9ad0c54a179e9089c76274 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 11 Sep 2021 13:30:25 -0500 Subject: [PATCH 50/56] fixed brick_slab blockstates; redid slab loot datagen, added re-generated slab loot tables --- .../blocks/argonite_brick_slab.json | 27 ++++++++++++++----- .../blocks/ashstone_brick_slab.json | 27 ++++++++++++++----- .../blocks/dragonstone_brick_slab.json | 27 ++++++++++++++----- .../loot_tables/blocks/fyrite_brick_slab.json | 27 ++++++++++++++----- .../blocks/illumenite_brick_slab.json | 27 ++++++++++++++----- .../blocks/malachite_brick_slab.json | 27 ++++++++++++++----- .../datagen/NetherrocksLootTableProvider.java | 12 ++++----- .../blockstates/argonite_brick_slab.json | 2 +- .../blockstates/ashstone_brick_slab.json | 2 +- .../blockstates/dragonstone_brick_slab.json | 2 +- .../blockstates/fyrite_brick_slab.json | 2 +- .../blockstates/illumenite_brick_slab.json | 2 +- .../blockstates/malachite_brick_slab.json | 2 +- 13 files changed, 132 insertions(+), 54 deletions(-) diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_slab.json index 6d65a1ca..dcfc942b 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_slab.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_slab.json @@ -7,15 +7,28 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "netherrocks:argonite_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "netherrocks:argonite_brick_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_slab.json index 4f7eb954..4be87d44 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_slab.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_slab.json @@ -7,15 +7,28 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "netherrocks:ashstone_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "netherrocks:ashstone_brick_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_slab.json index 4fe6c1bd..fce5e6a2 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_slab.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_slab.json @@ -7,15 +7,28 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "netherrocks:dragonstone_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "netherrocks:dragonstone_brick_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_slab.json index 18abd4a4..26e44817 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_slab.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_slab.json @@ -7,15 +7,28 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "netherrocks:fyrite_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "netherrocks:fyrite_brick_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_slab.json index 7450fb79..4a194521 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_slab.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_slab.json @@ -7,15 +7,28 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "netherrocks:illumenite_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "netherrocks:illumenite_brick_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_slab.json index 1eea776e..f675163c 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_slab.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_slab.json @@ -7,15 +7,28 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "netherrocks:malachite_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "netherrocks:malachite_brick_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java index 68a11e07..57d26426 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java @@ -32,7 +32,7 @@ protected List>>, L standardDropTable(ModBlocks.raw_argonite_block.get()); standardDropTable(ModBlocks.argonite_bricks.get()); standardDropTable(ModBlocks.argonite_brick_stairs.get()); - standardDropTable(ModBlocks.argonite_brick_slab.get()); + slabDropTable(ModBlocks.argonite_brick_slab.get()); standardDropTable(ModBlocks.argonite_bars.get()); standardDropTable(ModBlocks.argonite_door.get()); specialDropTable(ModBlocks.argonite_ore.get(), ModItems.raw_argonite.get()); @@ -40,7 +40,7 @@ protected List>>, L standardDropTable(ModBlocks.ashstone_block.get()); standardDropTable(ModBlocks.ashstone_bricks.get()); standardDropTable(ModBlocks.ashstone_brick_stairs.get()); - standardDropTable(ModBlocks.ashstone_brick_slab.get()); + slabDropTable(ModBlocks.ashstone_brick_slab.get()); standardDropTable(ModBlocks.ashstone_bars.get()); standardDropTable(ModBlocks.ashstone_door.get()); specialDropTable(ModBlocks.ashstone_ore.get(), ModItems.ashstone_gem.get()); @@ -48,7 +48,7 @@ protected List>>, L standardDropTable(ModBlocks.dragonstone_block.get()); standardDropTable(ModBlocks.dragonstone_bricks.get()); standardDropTable(ModBlocks.dragonstone_brick_stairs.get()); - standardDropTable(ModBlocks.dragonstone_brick_slab.get()); + slabDropTable(ModBlocks.dragonstone_brick_slab.get()); standardDropTable(ModBlocks.dragonstone_bars.get()); standardDropTable(ModBlocks.dragonstone_door.get()); specialDropTable(ModBlocks.dragonstone_ore.get(), ModItems.dragonstone_gem.get()); @@ -57,7 +57,7 @@ protected List>>, L standardDropTable(ModBlocks.raw_fyrite_block.get()); standardDropTable(ModBlocks.fyrite_bricks.get()); standardDropTable(ModBlocks.fyrite_brick_stairs.get()); - standardDropTable(ModBlocks.fyrite_brick_slab.get()); + slabDropTable(ModBlocks.fyrite_brick_slab.get()); standardDropTable(ModBlocks.fyrite_bars.get()); standardDropTable(ModBlocks.fyrite_door.get()); specialDropTable(ModBlocks.fyrite_ore.get(), ModItems.raw_fyrite.get()); @@ -66,7 +66,7 @@ protected List>>, L standardDropTable(ModBlocks.raw_illumenite_block.get()); standardDropTable(ModBlocks.illumenite_bricks.get()); standardDropTable(ModBlocks.illumenite_brick_stairs.get()); - standardDropTable(ModBlocks.illumenite_brick_slab.get()); + slabDropTable(ModBlocks.illumenite_brick_slab.get()); standardDropTable(ModBlocks.illumenite_bars.get()); standardDropTable(ModBlocks.illumenite_door.get()); specialDropTable(ModBlocks.illumenite_ore.get(), ModItems.raw_illumenite.get()); @@ -75,7 +75,7 @@ protected List>>, L standardDropTable(ModBlocks.raw_malachite_block.get()); standardDropTable(ModBlocks.malachite_bricks.get()); standardDropTable(ModBlocks.malachite_brick_stairs.get()); - standardDropTable(ModBlocks.malachite_brick_slab.get()); + slabDropTable(ModBlocks.malachite_brick_slab.get()); standardDropTable(ModBlocks.malachite_bars.get()); standardDropTable(ModBlocks.malachite_door.get()); specialDropTable(ModBlocks.malachite_ore.get(), ModItems.raw_malachite.get()); diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/argonite_brick_slab.json index adc11dcc..2f729823 100644 --- a/src/main/resources/assets/netherrocks/blockstates/argonite_brick_slab.json +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_brick_slab.json @@ -4,7 +4,7 @@ "model": "netherrocks:block/argonite_brick_slab" }, "type=double": { - "model": "netherrocks:block/argonite_brick_slab" + "model": "netherrocks:block/argonite_bricks" }, "type=top": { "model": "netherrocks:block/argonite_brick_slab_top" diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_slab.json index 1cc108e8..80bbf636 100644 --- a/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_slab.json +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_slab.json @@ -4,7 +4,7 @@ "model": "netherrocks:block/ashstone_brick_slab" }, "type=double": { - "model": "netherrocks:block/ashstone_brick_slab" + "model": "netherrocks:block/ashstone_bricks" }, "type=top": { "model": "netherrocks:block/ashstone_brick_slab_top" diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_slab.json index 580f6c8d..d3758f59 100644 --- a/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_slab.json +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_slab.json @@ -4,7 +4,7 @@ "model": "netherrocks:block/dragonstone_brick_slab" }, "type=double": { - "model": "netherrocks:block/dragonstone_brick_slab" + "model": "netherrocks:block/dragonstone_bricks" }, "type=top": { "model": "netherrocks:block/dragonstone_brick_slab_top" diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_slab.json index 35d37fa2..6113729d 100644 --- a/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_slab.json +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_slab.json @@ -4,7 +4,7 @@ "model": "netherrocks:block/fyrite_brick_slab" }, "type=double": { - "model": "netherrocks:block/fyrite_brick_slab" + "model": "netherrocks:block/fyrite_bricks" }, "type=top": { "model": "netherrocks:block/fyrite_brick_slab_top" diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_slab.json index 62131f55..790e9f4d 100644 --- a/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_slab.json +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_slab.json @@ -4,7 +4,7 @@ "model": "netherrocks:block/illumenite_brick_slab" }, "type=double": { - "model": "netherrocks:block/illumenite_brick_slab" + "model": "netherrocks:block/illumenite_bricks" }, "type=top": { "model": "netherrocks:block/illumenite_brick_slab_top" diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/malachite_brick_slab.json index bbb4d109..fdc750e2 100644 --- a/src/main/resources/assets/netherrocks/blockstates/malachite_brick_slab.json +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_brick_slab.json @@ -4,7 +4,7 @@ "model": "netherrocks:block/malachite_brick_slab" }, "type=double": { - "model": "netherrocks:block/malachite_brick_slab" + "model": "netherrocks:block/malachite_bricks" }, "type=top": { "model": "netherrocks:block/malachite_brick_slab_top" From 4aa0e44cb8eb89adb6ba498769fd3367988178c8 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 11 Sep 2021 13:31:10 -0500 Subject: [PATCH 51/56] updated mods.toml for new required SimpleCoreLib --- src/main/resources/META-INF/mods.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 038b3292..c41568a8 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -39,7 +39,7 @@ Additional Credits: AzazEL3095 (Spanish translation) [[dependencies.netherrocks]] modId="simplecorelib" mandatory=true - versionRange="[1.17.1-3.0.1.0,1.17.1-3.1.0.0)" + versionRange="[1.17.1-3.0.4.0,1.17.1-3.1.0.0)" ordering="NONE" side="BOTH" From 010f3ddce409af21fb60a9c2b5d40f3dca790d74 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Sat, 11 Sep 2021 13:35:11 -0500 Subject: [PATCH 52/56] updated json --- update.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update.json b/update.json index 833accb7..3aa97689 100644 --- a/update.json +++ b/update.json @@ -23,7 +23,7 @@ "1.16.4-recommended" : "1.16.4-2.3.3.2", "1.16.5-latest" : "1.16.5-2.3.6.5", "1.16.5-recommended" : "1.16.5-2.3.6.4", - "1.17.1-latest" : "1.17.1-3.0.0.4", - "1.17.1-recommended" : "1.17.1-3.0.0.4" + "1.17.1-latest" : "1.17.1-3.0.0.6", + "1.17.1-recommended" : "1.17.1-3.0.0.6" } } From 0a40574dbb7c0823e2ac9e2e195785f2061c9cb6 Mon Sep 17 00:00:00 2001 From: Sinhika Date: Wed, 20 Oct 2021 10:36:03 -0500 Subject: [PATCH 53/56] updated forge version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 92bbf6c9..fe9a5ff9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.java.home=/usr/lib/jvm/adoptopenjdk-16-hotspot-amd64 # general version_minecraft = 1.17.1 -version_forge = 1.17.1-37.0.58 +version_forge = 1.17.1-37.0.97 # Simple Ores: Netherrocks version_mod = 3.0.0 From 41d11ec410fc7595470367d7a69731890b6069ab Mon Sep 17 00:00:00 2001 From: Sinhika Date: Wed, 24 Nov 2021 10:55:53 -0600 Subject: [PATCH 54/56] updated forge & simplecorelib versions --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index fe9a5ff9..54d7c3d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,11 +6,11 @@ org.gradle.java.home=/usr/lib/jvm/adoptopenjdk-16-hotspot-amd64 # general version_minecraft = 1.17.1 -version_forge = 1.17.1-37.0.97 +version_forge = 1.17.1-37.0.116 # Simple Ores: Netherrocks version_mod = 3.0.0 -simplecorelib_version = 1.17.1-3.0.4.0 -simpleores_version = 1.17.1-3.0.1.1 +simplecorelib_version = 1.17.1-3.0.5.0 +simpleores_version = 1.17.1-3.0.1.4 version_mcjei = 1.17.1 jei_version = 8.0.0.12 From 4fbe3659b5845bf7163ac6b6d6dc754f9648c73d Mon Sep 17 00:00:00 2001 From: Sinhika Date: Wed, 12 Jan 2022 10:11:54 -0600 Subject: [PATCH 55/56] fixed handling of 'final' version tag; rebuilt final 1.17 version --- build.gradle | 2 +- gradle.properties | 8 ++++---- .../netherrocks/loot_tables/blocks/argonite_bars.json | 3 +-- .../netherrocks/loot_tables/blocks/argonite_block.json | 3 +-- .../loot_tables/blocks/argonite_brick_stairs.json | 3 +-- .../netherrocks/loot_tables/blocks/argonite_bricks.json | 3 +-- .../netherrocks/loot_tables/blocks/argonite_door.json | 3 +-- .../netherrocks/loot_tables/blocks/ashstone_bars.json | 3 +-- .../netherrocks/loot_tables/blocks/ashstone_block.json | 3 +-- .../loot_tables/blocks/ashstone_brick_stairs.json | 3 +-- .../netherrocks/loot_tables/blocks/ashstone_bricks.json | 3 +-- .../netherrocks/loot_tables/blocks/ashstone_door.json | 3 +-- .../netherrocks/loot_tables/blocks/dragonstone_bars.json | 3 +-- .../netherrocks/loot_tables/blocks/dragonstone_block.json | 3 +-- .../loot_tables/blocks/dragonstone_brick_stairs.json | 3 +-- .../loot_tables/blocks/dragonstone_bricks.json | 3 +-- .../netherrocks/loot_tables/blocks/dragonstone_door.json | 3 +-- .../data/netherrocks/loot_tables/blocks/fyrite_bars.json | 3 +-- .../data/netherrocks/loot_tables/blocks/fyrite_block.json | 3 +-- .../loot_tables/blocks/fyrite_brick_stairs.json | 3 +-- .../netherrocks/loot_tables/blocks/fyrite_bricks.json | 3 +-- .../data/netherrocks/loot_tables/blocks/fyrite_door.json | 3 +-- .../netherrocks/loot_tables/blocks/illumenite_bars.json | 3 +-- .../netherrocks/loot_tables/blocks/illumenite_block.json | 3 +-- .../loot_tables/blocks/illumenite_brick_stairs.json | 3 +-- .../netherrocks/loot_tables/blocks/illumenite_bricks.json | 3 +-- .../netherrocks/loot_tables/blocks/illumenite_door.json | 3 +-- .../netherrocks/loot_tables/blocks/malachite_bars.json | 3 +-- .../netherrocks/loot_tables/blocks/malachite_block.json | 3 +-- .../loot_tables/blocks/malachite_brick_stairs.json | 3 +-- .../netherrocks/loot_tables/blocks/malachite_bricks.json | 3 +-- .../netherrocks/loot_tables/blocks/malachite_door.json | 3 +-- .../loot_tables/blocks/raw_argonite_block.json | 3 +-- .../netherrocks/loot_tables/blocks/raw_fyrite_block.json | 3 +-- .../loot_tables/blocks/raw_illumenite_block.json | 3 +-- .../loot_tables/blocks/raw_malachite_block.json | 3 +-- .../data/netherrocks/loot_tables/inject/bastion.json | 3 +-- .../netherrocks/loot_tables/inject/desert_pyramid.json | 3 +-- .../netherrocks/loot_tables/inject/jungle_temple.json | 3 +-- .../netherrocks/loot_tables/inject/ruined_portal.json | 3 +-- .../data/netherrocks/loot_tables/inject/stronghold.json | 3 +-- 41 files changed, 44 insertions(+), 83 deletions(-) diff --git a/build.gradle b/build.gradle index 36a78a7a..6d7350dd 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ def getVersionAppendage() { return "DEV-" + proc.text.trim() } -version = "${version_minecraft}-${version_mod}." + getVersionAppendage() +version = "${version_minecraft}-${version_mod}." + getVersionAppendage() + '-final' group = 'mod.alexndr.netherrocks' archivesBaseName = 'netherrocks' diff --git a/gradle.properties b/gradle.properties index 54d7c3d3..a68dc53f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,11 +6,11 @@ org.gradle.java.home=/usr/lib/jvm/adoptopenjdk-16-hotspot-amd64 # general version_minecraft = 1.17.1 -version_forge = 1.17.1-37.0.116 +version_forge = 1.17.1-37.1.1 # Simple Ores: Netherrocks version_mod = 3.0.0 -simplecorelib_version = 1.17.1-3.0.5.0 -simpleores_version = 1.17.1-3.0.1.4 +simplecorelib_version = 1.17.1-3.0.5.3-final +simpleores_version = 1.17.1-3.0.1.6-final version_mcjei = 1.17.1 -jei_version = 8.0.0.12 +jei_version = 8.3.0.45 diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bars.json index cfb8e299..5503bf73 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bars.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bars.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_block.json index e76c86ef..1db95a35 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_block.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_stairs.json index 9c61daa2..b015c240 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_stairs.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_stairs.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bricks.json index 1baf6c6d..c1da30bc 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bricks.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bricks.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_door.json index a0054359..a790225b 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_door.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_door.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bars.json index a2b50c8b..4ddd3700 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bars.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bars.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_block.json index e58d710f..1679cff7 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_block.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_stairs.json index 1106fdba..5bfa55da 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_stairs.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_stairs.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bricks.json index d8c00dfc..7659bb83 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bricks.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bricks.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_door.json index fba3c1a3..839b7483 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_door.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_door.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bars.json index 4a69a457..599267a8 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bars.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bars.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_block.json index 59072e50..7644ee38 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_block.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_stairs.json index 6dc588eb..a5a1274b 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_stairs.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_stairs.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bricks.json index 8bbe10bb..6368e26e 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bricks.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bricks.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_door.json index 1a34ca33..926d8138 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_door.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_door.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bars.json index a123a1bb..8cf10f4e 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bars.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bars.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_block.json index 1a877de9..cca77084 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_block.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_stairs.json index 12d9eb4d..16fe0ad2 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_stairs.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_stairs.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bricks.json index a64ab06b..ee231bfe 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bricks.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bricks.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_door.json index b9f8f749..80cd4c50 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_door.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_door.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bars.json index f099468b..d6776c59 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bars.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bars.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_block.json index eb96c8e0..7bb391a3 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_block.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_stairs.json index cf99480b..d10d50f6 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_stairs.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_stairs.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bricks.json index d4fab093..23b60a5f 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bricks.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bricks.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_door.json index 80e5e264..4749d7e1 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_door.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_door.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bars.json index a91901c1..2e486212 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bars.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bars.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_block.json index 94d94f43..4adbd6e4 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_block.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_stairs.json index f3fe16c7..71e57e1b 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_stairs.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_stairs.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bricks.json index ff0f6377..a92144c7 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bricks.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bricks.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_door.json index 6a0342e0..a79fbecb 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_door.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_door.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_argonite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_argonite_block.json index eda30d42..9bf0a0d0 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_argonite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_argonite_block.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_fyrite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_fyrite_block.json index b3a75be9..d36254eb 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_fyrite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_fyrite_block.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_illumenite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_illumenite_block.json index c1eff668..56b1a71b 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_illumenite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_illumenite_block.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_malachite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_malachite_block.json index 31293980..cc13a2a9 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_malachite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_malachite_block.json @@ -14,8 +14,7 @@ { "condition": "minecraft:survives_explosion" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/bastion.json b/src/generated/resources/data/netherrocks/loot_tables/inject/bastion.json index 1ff36dde..e8c7b569 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/bastion.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/bastion.json @@ -277,8 +277,7 @@ "condition": "minecraft:random_chance", "chance": 0.75 } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/desert_pyramid.json b/src/generated/resources/data/netherrocks/loot_tables/inject/desert_pyramid.json index 91acd1f8..b9e55e8a 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/desert_pyramid.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/desert_pyramid.json @@ -63,8 +63,7 @@ "condition": "minecraft:random_chance", "chance": 0.25 } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/jungle_temple.json b/src/generated/resources/data/netherrocks/loot_tables/inject/jungle_temple.json index b67899a5..d63011e4 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/jungle_temple.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/jungle_temple.json @@ -47,8 +47,7 @@ "condition": "minecraft:random_chance", "chance": 0.25 } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/ruined_portal.json b/src/generated/resources/data/netherrocks/loot_tables/inject/ruined_portal.json index 1949e3be..79b52b5f 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/ruined_portal.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/ruined_portal.json @@ -110,8 +110,7 @@ "condition": "minecraft:random_chance", "chance": 0.5 } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/stronghold.json b/src/generated/resources/data/netherrocks/loot_tables/inject/stronghold.json index be465530..060ecb31 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/stronghold.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/stronghold.json @@ -107,8 +107,7 @@ "condition": "minecraft:random_chance", "chance": 0.25 } - ], - "functions": [] + ] } ] } \ No newline at end of file From b87a05493b54bd9e4f7b68c63f90950fb9b14a8a Mon Sep 17 00:00:00 2001 From: Sinhika Date: Wed, 12 Jan 2022 10:12:44 -0600 Subject: [PATCH 56/56] updated json --- update.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update.json b/update.json index 3aa97689..3f14547c 100644 --- a/update.json +++ b/update.json @@ -23,7 +23,7 @@ "1.16.4-recommended" : "1.16.4-2.3.3.2", "1.16.5-latest" : "1.16.5-2.3.6.5", "1.16.5-recommended" : "1.16.5-2.3.6.4", - "1.17.1-latest" : "1.17.1-3.0.0.6", - "1.17.1-recommended" : "1.17.1-3.0.0.6" + "1.17.1-latest" : "1.17.1-3.0.0.7-final", + "1.17.1-recommended" : "1.17.1-3.0.0.7-final" } }