diff --git a/src/main/java/biomesoplenty/init/ModEntities.java b/src/main/java/biomesoplenty/init/ModEntities.java index 4260d099e..e293bfd4e 100644 --- a/src/main/java/biomesoplenty/init/ModEntities.java +++ b/src/main/java/biomesoplenty/init/ModEntities.java @@ -7,25 +7,20 @@ ******************************************************************************/ package biomesoplenty.init; -import static biomesoplenty.api.entity.BOPEntities.*; +import static biomesoplenty.api.entity.BOPEntities.boat_bop; +import static biomesoplenty.api.entity.BOPEntities.mudball; import java.util.function.Function; import biomesoplenty.api.item.BOPItems; -import biomesoplenty.core.BiomesOPlenty; -import com.mojang.datafixers.DataFixUtils; -import com.mojang.datafixers.types.Type; - import biomesoplenty.common.entity.item.EntityBoatBOP; +import biomesoplenty.common.entity.item.RenderBoatBOP; import biomesoplenty.common.entity.projectile.EntityMudball; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderSprite; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; -import net.minecraft.init.Items; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.datafix.DataFixesManager; -import net.minecraft.util.datafix.TypeReferences; import net.minecraft.world.World; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.registries.ForgeRegistries; @@ -50,5 +45,6 @@ public class ModEntities public static void registerRendering() { RenderingRegistry.registerEntityRenderingHandler(EntityMudball.class, manager -> new RenderSprite<>(manager, BOPItems.mudball, Minecraft.getInstance().getItemRenderer())); + RenderingRegistry.registerEntityRenderingHandler(EntityBoatBOP.class, manager -> new RenderBoatBOP(manager)); } } diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/misc/cactus_green_from_tiny_cactus.json b/src/main/resources/data/biomesoplenty/advancements/recipes/misc/cactus_green_from_tiny_cactus.json new file mode 100644 index 000000000..78fef41e3 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/misc/cactus_green_from_tiny_cactus.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:cactus_green_from_tiny_cactus" + ] + }, + "criteria": { + "has_tiny_cactus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:tiny_cactus" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:cactus_green_from_tiny_cactus" + } + } + }, + "requirements": [ + [ + "has_tiny_cactus", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/misc/mud_brick.json b/src/main/resources/data/biomesoplenty/advancements/recipes/misc/mud_brick.json new file mode 100644 index 000000000..8deb3f207 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/misc/mud_brick.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:mud_brick" + ] + }, + "criteria": { + "has_mudball": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:mudball" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:mud_brick" + } + } + }, + "requirements": [ + [ + "has_mudball", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/cactus_green_from_tiny_cactus.json b/src/main/resources/data/biomesoplenty/recipes/cactus_green_from_tiny_cactus.json new file mode 100644 index 000000000..c0656fd61 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/cactus_green_from_tiny_cactus.json @@ -0,0 +1,9 @@ +{ + "type": "smelting", + "ingredient": { + "item": "biomesoplenty:tiny_cactus" + }, + "result": "minecraft:cactus_green", + "experience": 1.0, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/mud_brick_from_smelting.json b/src/main/resources/data/biomesoplenty/recipes/mud_brick_from_smelting.json new file mode 100644 index 000000000..5a72648ae --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/mud_brick_from_smelting.json @@ -0,0 +1,9 @@ +{ + "type": "smelting", + "ingredient": { + "item": "biomesoplenty:mudball" + }, + "result": "biomesoplenty:mud_brick", + "experience": 0.3, + "cookingtime": 200 +} \ No newline at end of file