diff --git a/src/main/generated/assets/acesbs/models/item/aquarium_gravel.json b/src/main/generated/assets/acesbs/models/item/aquarium_gravel.json new file mode 100644 index 0000000..a512c5f --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/aquarium_gravel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/aquarium_gravel" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/combat/combustible_lemon.json b/src/main/generated/data/acesbs/advancement/recipes/combat/combustible_lemon.json new file mode 100644 index 0000000..f2c2c7d --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/combat/combustible_lemon.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lemon": { + "conditions": { + "items": [ + { + "items": "acesbs:lemon" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:combustible_lemon" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lemon" + ] + ], + "rewards": { + "recipes": [ + "acesbs:combustible_lemon" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/combustible_lemon.json b/src/main/generated/data/acesbs/recipe/combustible_lemon.json new file mode 100644 index 0000000..a538861 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/combustible_lemon.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "acesbs:lemon" + }, + { + "item": "minecraft:fire_charge" + }, + { + "item": "minecraft:gunpowder" + } + ], + "result": { + "count": 1, + "id": "acesbs:combustible_lemon" + } +} \ No newline at end of file diff --git a/src/main/java/com/acethewildfire/acesbs/AcesBS.java b/src/main/java/com/acethewildfire/acesbs/AcesBS.java index 59719fe..0f60663 100644 --- a/src/main/java/com/acethewildfire/acesbs/AcesBS.java +++ b/src/main/java/com/acethewildfire/acesbs/AcesBS.java @@ -15,8 +15,11 @@ import com.acethewildfire.acesbs.recipe.ModRecipies; import com.acethewildfire.acesbs.screen.ModScreenHandlers; import com.acethewildfire.acesbs.sounds.ModSounds; import com.acethewildfire.acesbs.util.*; +import com.acethewildfire.acesbs.villager.ModVillagers; import com.acethewildfire.acesbs.world.gen.ModWorldGeneration; import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerEntityEvents; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.fabricmc.fabric.api.event.player.AttackEntityCallback; import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; @@ -26,10 +29,14 @@ import net.fabricmc.fabric.api.registry.CompostingChanceRegistry; import net.fabricmc.fabric.api.registry.FabricBrewingRecipeRegistryBuilder; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.fabricmc.fabric.api.registry.StrippableBlockRegistry; +import net.minecraft.entity.Entity; import net.minecraft.entity.mob.SkeletonEntity; +import net.minecraft.entity.passive.VillagerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.nbt.NbtCompound; import net.minecraft.potion.Potions; +import net.minecraft.server.world.ServerWorld; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,6 +69,7 @@ public class AcesBS implements ModInitializer { ModRecipies.registerRecipes(); ModParticles.registerModParticles(); ModStats.registerStats(); + ModVillagers.registerVillagers(); ConversionManager.init(); diff --git a/src/main/java/com/acethewildfire/acesbs/V1 Complete.txt b/src/main/java/com/acethewildfire/acesbs/V1 Complete.txt index d041a93..9e3345d 100644 --- a/src/main/java/com/acethewildfire/acesbs/V1 Complete.txt +++ b/src/main/java/com/acethewildfire/acesbs/V1 Complete.txt @@ -1,13 +1,5 @@ Ahab's Harpoon -Aquarium Gravel -Burning Wizard (Infernal Ashes on a Villager) -- Sells fire items - -Advancements -JEI Make sure everything is craft able -- Combustable lemon -- Prisma Armor diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java index 820c8d0..5363e71 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java @@ -77,6 +77,7 @@ public class ModModelProvider extends FabricModelProvider { itemModelGenerator.register(ModItems.COOKED_LEMON, Models.GENERATED); itemModelGenerator.register(ModItems.LEMON, Models.GENERATED); itemModelGenerator.register(ModItems.INFERNAL_BEEF, Models.GENERATED); + itemModelGenerator.register(ModItems.AQUARIUM_GRAVEL, Models.GENERATED); itemModelGenerator.register(ModItems.BRICKED_UP, Models.GENERATED); itemModelGenerator.register(ModItems.TOBACCO, Models.GENERATED); itemModelGenerator.register(ModItems.RAW_ENTROPY, Models.GENERATED); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java index d25ebc2..4c01b3b 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java @@ -133,6 +133,13 @@ public class ModRecipeProvider extends FabricRecipeProvider { .criterion(hasItem(ModItems.RAW_ENTROPY), conditionsFromItem(ModItems.RAW_ENTROPY)) .offerTo(recipeExporter); + ShapelessRecipeJsonBuilder.create(RecipeCategory.COMBAT, ModItems.COMBUSTIBLE_LEMON, 1) + .input(ModItems.LEMON, 1) + .input(Items.FIRE_CHARGE, 1) + .input(Items.GUNPOWDER, 1) + .criterion(hasItem(ModItems.LEMON), conditionsFromItem(ModItems.LEMON)) + .offerTo(recipeExporter); + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, ModBlocks.CRYSTAL_ENTROPY_PANE, 16) .pattern("###") .pattern("###") diff --git a/src/main/java/com/acethewildfire/acesbs/entity/ModEntities.java b/src/main/java/com/acethewildfire/acesbs/entity/ModEntities.java index ccaa1c9..e0fd820 100644 --- a/src/main/java/com/acethewildfire/acesbs/entity/ModEntities.java +++ b/src/main/java/com/acethewildfire/acesbs/entity/ModEntities.java @@ -47,6 +47,12 @@ public class ModEntities { if (!(entity instanceof SkeletonEntity skeleton)) return ActionResult.PASS; + if ((entity instanceof VulgarBones vb)) return ActionResult.PASS; + + ItemStack stack = player.getStackInHand(hand); + + if (!stack.isOf(ModItems.STABLE_ENTROPY)) return ActionResult.PASS; + skeleton.setAiDisabled(true); skeleton.setInvulnerable(true); @@ -65,10 +71,6 @@ public class ModEntities { 0.0 // speed ); - ItemStack stack = player.getStackInHand(hand); - - if (!stack.isOf(ModItems.STABLE_ENTROPY)) return ActionResult.PASS; - ConversionManager.startConversion(skeleton, 20); if (!player.getAbilities().creativeMode) { diff --git a/src/main/java/com/acethewildfire/acesbs/entity/custom/BurningWizard.java b/src/main/java/com/acethewildfire/acesbs/entity/custom/BurningWizard.java new file mode 100644 index 0000000..9bf3289 --- /dev/null +++ b/src/main/java/com/acethewildfire/acesbs/entity/custom/BurningWizard.java @@ -0,0 +1,4 @@ +package com.acethewildfire.acesbs.entity.custom; + +public class BurningWizard { +} diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java index 242c224..1d61d46 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java @@ -28,6 +28,7 @@ public class ModItemGroups { entries.add(ModItems.INGOT_OF_ORDER); entries.add(ModItems.LEMON); entries.add(ModItems.COOKED_LEMON); + entries.add(ModItems.AQUARIUM_GRAVEL); entries.add(ModItems.INFERNAL_BEEF); entries.add(ModItems.BRICKED_UP); entries.add(ModItems.ORACLE_LEMON); diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModItems.java b/src/main/java/com/acethewildfire/acesbs/item/ModItems.java index 9fa9d30..e430acf 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItems.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItems.java @@ -206,6 +206,7 @@ public class ModItems { public static final Item CIGARETTE_LEMON = registerItem("cigarette_lemon", new CigaretteLemon(new Item.Settings().maxCount(20))); public static final Item CIGARETTE_FUNNY = registerItem("cigarette_funny", new CigaretteFunny(new Item.Settings().maxCount(20))); public static final Item BUBBLE_PIPE = registerItem("bubble_pipe", new BubblePipe(new Item.Settings().maxCount(1))); + public static final Item AQUARIUM_GRAVEL = registerItem("aquarium_gravel", new AquariumGravel(new Item.Settings().maxCount(1))); public static final Item FREN_SPAWN_EGG = registerItem("fren_spawn_egg", new SpawnEggItem(ModEntities.FREN, 894731, 0, new Item.Settings())); diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/AquariumGravel.java b/src/main/java/com/acethewildfire/acesbs/item/custom/AquariumGravel.java new file mode 100644 index 0000000..68f7027 --- /dev/null +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/AquariumGravel.java @@ -0,0 +1,65 @@ +package com.acethewildfire.acesbs.item.custom; + +import com.acethewildfire.acesbs.component.ModDataComponentTypes; +import com.acethewildfire.acesbs.effect.ModEffects; +import com.acethewildfire.acesbs.sounds.ModSounds; +import com.acethewildfire.acesbs.sounds.PlayerAttachedSound; +import com.acethewildfire.acesbs.util.ModStats; +import net.minecraft.client.MinecraftClient; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvent; +import net.minecraft.sound.SoundEvents; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.util.UseAction; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; + +public class AquariumGravel extends Item { + public AquariumGravel(Settings settings) { + super(settings); + } + + // Store the currently playing sound (client only) + private static PlayerAttachedSound activeSound; + + @Override + public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + ItemStack stack = user.getStackInHand(hand); + + user.setCurrentHand(hand); + + return TypedActionResult.consume(stack); + } + + @Override + public UseAction getUseAction(ItemStack stack) { + return UseAction.EAT; + } + + @Override + public SoundEvent getEatSound() { + return ModSounds.CRUNCH; + } + + @Override + public int getMaxUseTime(ItemStack stack, LivingEntity user) { + return 32; // basically infinite hold + } + + @Override + public void usageTick(World world, LivingEntity user, ItemStack stack, int remainingUseTicks) { + super.usageTick(world, user, stack, remainingUseTicks); + } + + @Override + public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) { + return stack; + } +} diff --git a/src/main/java/com/acethewildfire/acesbs/mixin/VillagerFireMixin.java b/src/main/java/com/acethewildfire/acesbs/mixin/VillagerFireMixin.java new file mode 100644 index 0000000..316659a --- /dev/null +++ b/src/main/java/com/acethewildfire/acesbs/mixin/VillagerFireMixin.java @@ -0,0 +1,35 @@ +package com.acethewildfire.acesbs.mixin; + +import com.acethewildfire.acesbs.AcesBS; +import com.acethewildfire.acesbs.villager.ModVillagers; +import net.minecraft.entity.passive.VillagerEntity; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.village.VillagerData; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(VillagerEntity.class) +public abstract class VillagerFireMixin { + + @Inject(method = "setVillagerData", at = @At("TAIL")) + private void applyBurningWizardFire(VillagerData villagerData, CallbackInfo ci) { + + VillagerEntity villager = (VillagerEntity)(Object)this; + + if (villagerData.getProfession() == ModVillagers.BURNING_WIZARD) { + NbtCompound nbt = new NbtCompound(); + villager.writeNbt(nbt); + nbt.putBoolean("HasVisualFire", true); + villager.readNbt(nbt); + } else { + NbtCompound nbt = new NbtCompound(); + villager.writeNbt(nbt); + nbt.putBoolean("HasVisualFire", false); + villager.readNbt(nbt); + } + + } + +} diff --git a/src/main/java/com/acethewildfire/acesbs/sounds/ModSounds.java b/src/main/java/com/acethewildfire/acesbs/sounds/ModSounds.java index 2f532bf..231d1c6 100644 --- a/src/main/java/com/acethewildfire/acesbs/sounds/ModSounds.java +++ b/src/main/java/com/acethewildfire/acesbs/sounds/ModSounds.java @@ -21,6 +21,7 @@ public class ModSounds { public static final SoundEvent VULGAR_BONES_HURT = registerSoundEvent("vulgar_bones_hurt"); public static final SoundEvent VULGAR_BONES_DEATH = registerSoundEvent("vulgar_bones_death"); public static final SoundEvent VULGAR_BONES_SPAWN = registerSoundEvent("vulgar_bones_spawn"); + public static final SoundEvent CRUNCH = registerSoundEvent("crunch"); // public static final BlockSoundGroup LIZARD_SOUNDS = new BlockSoundGroup(1f, 1f, SoundEvents.BLOCK_WOOD_BREAK, SoundEvents.BLOCK_WOOD_STEP, SoundEvents.BLOCK_WOOD_PLACE, SoundEvents.BLOCK_WOOD_HIT, SoundEvents.BLOCK_WOOD_FALL) diff --git a/src/main/java/com/acethewildfire/acesbs/villager/ModVillagers.java b/src/main/java/com/acethewildfire/acesbs/villager/ModVillagers.java new file mode 100644 index 0000000..6298e1b --- /dev/null +++ b/src/main/java/com/acethewildfire/acesbs/villager/ModVillagers.java @@ -0,0 +1,45 @@ +package com.acethewildfire.acesbs.villager; + +import com.acethewildfire.acesbs.AcesBS; +import com.acethewildfire.acesbs.block.ModBlocks; +import com.google.common.collect.ImmutableSet; +import net.fabricmc.fabric.api.object.builder.v1.world.poi.PointOfInterestHelper; +import net.minecraft.block.Block; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.sound.SoundEvents; +import net.minecraft.util.Identifier; +import net.minecraft.village.VillagerProfession; +import net.minecraft.world.poi.PointOfInterestType; + +public class ModVillagers { + + public static final RegistryKey BURNING_POI_KEY = registerPoiKey("burning_poi"); + public static final PointOfInterestType BURNING_POI = registerPOI("burning_poi", ModBlocks.INFERNAL_ASHES_BLOCK); + + public static final VillagerProfession BURNING_WIZARD = registerProfession("burning_wizard", BURNING_POI_KEY); + + + private static VillagerProfession registerProfession(String name, RegistryKey type) { + return Registry.register(Registries.VILLAGER_PROFESSION, Identifier.of(AcesBS.MOD_ID, name), + new VillagerProfession(name, entry -> entry.matchesKey(type), entry -> entry.matchesKey(type), + ImmutableSet.of(), ImmutableSet.of(), SoundEvents.ENTITY_VILLAGER_WORK_LIBRARIAN)); + } + + private static PointOfInterestType registerPOI(String name, Block block) { + return PointOfInterestHelper.register(Identifier.of(AcesBS.MOD_ID, name), + 1, 1, block); + } + + private static RegistryKey registerPoiKey(String name) { + return RegistryKey.of(RegistryKeys.POINT_OF_INTEREST_TYPE, Identifier.of(AcesBS.MOD_ID, name)); + } + + + public static void registerVillagers (){ + AcesBS.LOGGER.info("Registering Mod Villagers for " + AcesBS.MOD_ID); + } + +} diff --git a/src/main/resources/acesbs.mixins.json b/src/main/resources/acesbs.mixins.json index 33292f4..3de7ef8 100644 --- a/src/main/resources/acesbs.mixins.json +++ b/src/main/resources/acesbs.mixins.json @@ -7,9 +7,10 @@ "CreeperTickMixin", "CreeperTransformStateMixin", "EntityMixin", - "LivingEntityMixin", "ExampleMixin", - "PlayerEntityMixin" + "LivingEntityMixin", + "PlayerEntityMixin", + "VillagerFireMixin" ], "injectors": { "defaultRequire": 1 diff --git a/src/main/resources/assets/acesbs/lang/en_us.json b/src/main/resources/assets/acesbs/lang/en_us.json index 35b1565..b977425 100644 --- a/src/main/resources/assets/acesbs/lang/en_us.json +++ b/src/main/resources/assets/acesbs/lang/en_us.json @@ -9,6 +9,7 @@ "item.acesbs.lemon": "Odd Lemon", "item.acesbs.infernal_beef": "Infernal Beef", "item.acesbs.bricked_up": "Bricked Up", + "item.acesbs.aquarium_gravel": "Aquarium Gravel", "item.acesbs.cooked_lemon": "Cooked Odd Lemon", "item.acesbs.green_bricks": "Green Bricks", "item.acesbs.wand": "Entropy Wand", @@ -218,6 +219,7 @@ "sounds.acesbs.vulgar_bones_ambient": "Vulgar Bones Swears", "sounds.acesbs.vulgar_bones_hurt": "Vulgar Bones Swears Painfully", "sounds.acesbs.vulgar_bones_death": "Vulgar Bones Utters Final Swears", + "sounds.acesbs.crunch": "Loud Crunching", "enchantment.acesbs.lightning_strike": "Lightning Strike", @@ -225,6 +227,7 @@ "entity.acesbs.combustible_lemon": "Combustible Lemon", "entity.acesbs.vulgar_bones": "Captain Vulgar Bones", + "entity.minecraft.villager.burning_wizard": "Burning Wizard", "effect.acesbs.infernal_fire": "Infernal Fire", "effect.acesbs.lemon": "Puckered", diff --git a/src/main/resources/assets/acesbs/sounds.json b/src/main/resources/assets/acesbs/sounds.json index 3d37b8c..4a26ba5 100644 --- a/src/main/resources/assets/acesbs/sounds.json +++ b/src/main/resources/assets/acesbs/sounds.json @@ -65,5 +65,9 @@ "vulgar_bones_death": { "subtitle": "sounds.acesbs.vulgar_bones_death", "sounds": ["acesbs:vulgar_bones_death_1", "acesbs:vulgar_bones_death_2", "acesbs:vulgar_bones_death_3", "acesbs:vulgar_bones_death_4"] + }, + "crunch": { + "subtitle": "sounds.acesbs.crunch", + "sounds": ["acesbs:crunch_1","acesbs:crunch_2","acesbs:crunch_3","acesbs:crunch_4","acesbs:crunch_5","acesbs:crunch_6","acesbs:crunch_7","acesbs:crunch_8","acesbs:crunch_9"] } } \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/sounds/crunch_1.ogg b/src/main/resources/assets/acesbs/sounds/crunch_1.ogg new file mode 100644 index 0000000..33b8f13 Binary files /dev/null and b/src/main/resources/assets/acesbs/sounds/crunch_1.ogg differ diff --git a/src/main/resources/assets/acesbs/sounds/crunch_2.ogg b/src/main/resources/assets/acesbs/sounds/crunch_2.ogg new file mode 100644 index 0000000..952b67c Binary files /dev/null and b/src/main/resources/assets/acesbs/sounds/crunch_2.ogg differ diff --git a/src/main/resources/assets/acesbs/sounds/crunch_3.ogg b/src/main/resources/assets/acesbs/sounds/crunch_3.ogg new file mode 100644 index 0000000..d5e2f9b Binary files /dev/null and b/src/main/resources/assets/acesbs/sounds/crunch_3.ogg differ diff --git a/src/main/resources/assets/acesbs/sounds/crunch_4.ogg b/src/main/resources/assets/acesbs/sounds/crunch_4.ogg new file mode 100644 index 0000000..61762e3 Binary files /dev/null and b/src/main/resources/assets/acesbs/sounds/crunch_4.ogg differ diff --git a/src/main/resources/assets/acesbs/sounds/crunch_5.ogg b/src/main/resources/assets/acesbs/sounds/crunch_5.ogg new file mode 100644 index 0000000..5d008d2 Binary files /dev/null and b/src/main/resources/assets/acesbs/sounds/crunch_5.ogg differ diff --git a/src/main/resources/assets/acesbs/sounds/crunch_6.ogg b/src/main/resources/assets/acesbs/sounds/crunch_6.ogg new file mode 100644 index 0000000..461cc2f Binary files /dev/null and b/src/main/resources/assets/acesbs/sounds/crunch_6.ogg differ diff --git a/src/main/resources/assets/acesbs/sounds/crunch_7.ogg b/src/main/resources/assets/acesbs/sounds/crunch_7.ogg new file mode 100644 index 0000000..cc9c277 Binary files /dev/null and b/src/main/resources/assets/acesbs/sounds/crunch_7.ogg differ diff --git a/src/main/resources/assets/acesbs/sounds/crunch_8.ogg b/src/main/resources/assets/acesbs/sounds/crunch_8.ogg new file mode 100644 index 0000000..c79020b Binary files /dev/null and b/src/main/resources/assets/acesbs/sounds/crunch_8.ogg differ diff --git a/src/main/resources/assets/acesbs/sounds/crunch_9.ogg b/src/main/resources/assets/acesbs/sounds/crunch_9.ogg new file mode 100644 index 0000000..da260d8 Binary files /dev/null and b/src/main/resources/assets/acesbs/sounds/crunch_9.ogg differ diff --git a/src/main/resources/assets/acesbs/textures/block/fire_1.png b/src/main/resources/assets/acesbs/textures/block/fire_1.png new file mode 100644 index 0000000..976cab9 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/block/fire_1.png differ diff --git a/src/main/resources/assets/acesbs/textures/entity/villager/profession/burning_wizard.png b/src/main/resources/assets/acesbs/textures/entity/villager/profession/burning_wizard.png new file mode 100644 index 0000000..4ba0d85 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/entity/villager/profession/burning_wizard.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/aquarium_gravel.png b/src/main/resources/assets/acesbs/textures/item/aquarium_gravel.png new file mode 100644 index 0000000..a5bee8d Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/aquarium_gravel.png differ diff --git a/src/main/resources/data/acesbs/recipe/aquarium_gravel_from_entropic_entangler.json b/src/main/resources/data/acesbs/recipe/aquarium_gravel_from_entropic_entangler.json new file mode 100644 index 0000000..c676f37 --- /dev/null +++ b/src/main/resources/data/acesbs/recipe/aquarium_gravel_from_entropic_entangler.json @@ -0,0 +1,13 @@ +{ + "type": "acesbs:entropic_entangler", + "ingredient": { + "item": "minecraft:prismarine_crystals" + }, + "ingredient2": { + "item": "acesbs:stable_entropy" + }, + "result": { + "count": 1, + "id": "acesbs:aquarium_gravel" + } +} \ No newline at end of file diff --git a/src/main/resources/data/acesbs/recipe/lemon_from_entropic_eviscerator.json b/src/main/resources/data/acesbs/recipe/lemon_from_entropic_eviscerator.json new file mode 100644 index 0000000..21fa58f --- /dev/null +++ b/src/main/resources/data/acesbs/recipe/lemon_from_entropic_eviscerator.json @@ -0,0 +1,10 @@ +{ + "type": "acesbs:entropic_eviscerator", + "ingredient": { + "item": "minecraft:apple" + }, + "result": { + "count": 1, + "id": "acesbs:lemon" + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json b/src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json new file mode 100644 index 0000000..7331000 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "acesbs:burning_poi", + "required": false + } + ] +} \ No newline at end of file