-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
✨ blue and white porcelain tools and weapon
- Loading branch information
1 parent
0fecf99
commit 606bff6
Showing
19 changed files
with
318 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/ultramarine/models/item/blue_and_white_porcelain_axe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/handheld", | ||
| "textures": { | ||
| "layer0": "ultramarine:item/blue_and_white_porcelain_axe" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/ultramarine/models/item/blue_and_white_porcelain_pickaxe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/handheld", | ||
| "textures": { | ||
| "layer0": "ultramarine:item/blue_and_white_porcelain_pickaxe" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/ultramarine/models/item/blue_and_white_porcelain_shovel.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/handheld", | ||
| "textures": { | ||
| "layer0": "ultramarine:item/blue_and_white_porcelain_shovel" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/ultramarine/models/item/blue_and_white_porcelain_sword.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/handheld", | ||
| "textures": { | ||
| "layer0": "ultramarine:item/blue_and_white_porcelain_sword" | ||
| } | ||
| } |
34 changes: 34 additions & 0 deletions
34
...s/data/minecraft/advancements/recipes/ultramarine.tools/blue_and_white_porcelain_axe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "minecraft:blue_and_white_porcelain_axe" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_blue_and_white_porcelain_piece": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "ultramarine:blue_and_white_porcelain_piece" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "minecraft:blue_and_white_porcelain_axe" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_blue_and_white_porcelain_piece", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
34 changes: 34 additions & 0 deletions
34
...ta/minecraft/advancements/recipes/ultramarine.tools/blue_and_white_porcelain_pickaxe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "minecraft:blue_and_white_porcelain_pickaxe" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_blue_and_white_porcelain_piece": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "ultramarine:blue_and_white_porcelain_piece" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "minecraft:blue_and_white_porcelain_pickaxe" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_blue_and_white_porcelain_piece", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
34 changes: 34 additions & 0 deletions
34
...ata/minecraft/advancements/recipes/ultramarine.tools/blue_and_white_porcelain_shovel.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "minecraft:blue_and_white_porcelain_shovel" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_blue_and_white_porcelain_piece": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "ultramarine:blue_and_white_porcelain_piece" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "minecraft:blue_and_white_porcelain_shovel" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_blue_and_white_porcelain_piece", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
34 changes: 34 additions & 0 deletions
34
...data/minecraft/advancements/recipes/ultramarine.tools/blue_and_white_porcelain_sword.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "minecraft:blue_and_white_porcelain_sword" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_blue_and_white_porcelain_piece": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "ultramarine:blue_and_white_porcelain_piece" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "minecraft:blue_and_white_porcelain_sword" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_blue_and_white_porcelain_piece", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
12 changes: 12 additions & 0 deletions
12
src/generated/resources/data/minecraft/recipes/blue_and_white_porcelain_axe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "type": "minecraft:smithing", | ||
| "base": { | ||
| "item": "minecraft:golden_axe" | ||
| }, | ||
| "addition": { | ||
| "item": "ultramarine:blue_and_white_porcelain_piece" | ||
| }, | ||
| "result": { | ||
| "item": "ultramarine:blue_and_white_porcelain_axe" | ||
| } | ||
| } |
12 changes: 12 additions & 0 deletions
12
src/generated/resources/data/minecraft/recipes/blue_and_white_porcelain_pickaxe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "type": "minecraft:smithing", | ||
| "base": { | ||
| "item": "minecraft:golden_pickaxe" | ||
| }, | ||
| "addition": { | ||
| "item": "ultramarine:blue_and_white_porcelain_piece" | ||
| }, | ||
| "result": { | ||
| "item": "ultramarine:blue_and_white_porcelain_pickaxe" | ||
| } | ||
| } |
12 changes: 12 additions & 0 deletions
12
src/generated/resources/data/minecraft/recipes/blue_and_white_porcelain_shovel.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "type": "minecraft:smithing", | ||
| "base": { | ||
| "item": "minecraft:golden_shovel" | ||
| }, | ||
| "addition": { | ||
| "item": "ultramarine:blue_and_white_porcelain_piece" | ||
| }, | ||
| "result": { | ||
| "item": "ultramarine:blue_and_white_porcelain_shovel" | ||
| } | ||
| } |
12 changes: 12 additions & 0 deletions
12
src/generated/resources/data/minecraft/recipes/blue_and_white_porcelain_sword.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "type": "minecraft:smithing", | ||
| "base": { | ||
| "item": "minecraft:golden_sword" | ||
| }, | ||
| "addition": { | ||
| "item": "ultramarine:blue_and_white_porcelain_piece" | ||
| }, | ||
| "result": { | ||
| "item": "ultramarine:blue_and_white_porcelain_sword" | ||
| } | ||
| } |
59 changes: 59 additions & 0 deletions
59
src/main/java/com/voxelutopia/ultramarine/data/ModTiers.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package com.voxelutopia.ultramarine.data; | ||
|
|
||
| import com.voxelutopia.ultramarine.data.registry.ItemRegistry; | ||
| import net.minecraft.util.LazyLoadedValue; | ||
| import net.minecraft.world.item.Tier; | ||
| import net.minecraft.world.item.crafting.Ingredient; | ||
|
|
||
| import java.util.function.Supplier; | ||
|
|
||
| public enum ModTiers implements Tier { | ||
| BLUE_AND_WHITE_PORCELAIN(3, 16, 14.0F, 5.0F, 24, () -> Ingredient.of(ItemRegistry.BLUE_AND_WHITE_PORCELAIN_PIECE.get())) | ||
| ; | ||
|
|
||
| private final int level; | ||
| private final int uses; | ||
| private final float speed; | ||
| private final float damage; | ||
| private final int enchantmentValue; | ||
| private final LazyLoadedValue<Ingredient> repairIngredient; | ||
|
|
||
| private ModTiers(int pLevel, int pUses, float pSpeed, float pDamage, int pEnchantmentValue, Supplier<Ingredient> pRepairIngredient) { | ||
| this.level = pLevel; | ||
| this.uses = pUses; | ||
| this.speed = pSpeed; | ||
| this.damage = pDamage; | ||
| this.enchantmentValue = pEnchantmentValue; | ||
| this.repairIngredient = new LazyLoadedValue<>(pRepairIngredient); | ||
| } | ||
|
|
||
| @Override | ||
| public int getUses() { | ||
| return uses; | ||
| } | ||
|
|
||
| @Override | ||
| public float getSpeed() { | ||
| return speed; | ||
| } | ||
|
|
||
| @Override | ||
| public float getAttackDamageBonus() { | ||
| return damage; | ||
| } | ||
|
|
||
| @Override | ||
| public int getLevel() { | ||
| return level; | ||
| } | ||
|
|
||
| @Override | ||
| public int getEnchantmentValue() { | ||
| return enchantmentValue; | ||
| } | ||
|
|
||
| @Override | ||
| public Ingredient getRepairIngredient() { | ||
| return repairIngredient.get(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.