PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-24 05:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rewrite gem recipes to pull from named pools of like items. It's not about the items, it's about the traits.

Browse source
This commit is contained in:
Sollace 2019-02-20 15:13:04 +02:00
parent 76a725c981
commit 3b2ffc0671
28 changed files with 222 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/minelittlepony/unicopia/Unicopia.java
View file

@ -25,6 +25,7 @@ import com.minelittlepony.jumpingcastle.api.IChannel;
import com.minelittlepony.jumpingcastle.api.JumpingCastle;
import com.minelittlepony.unicopia.advancements.UAdvancements;
import com.minelittlepony.unicopia.command.Commands;
import com.minelittlepony.unicopia.enchanting.AffineIngredients;
import com.minelittlepony.unicopia.enchanting.Pages;
import com.minelittlepony.unicopia.enchanting.SpellRecipe;
import com.minelittlepony.unicopia.forgebullshit.FBS;
@ -104,6 +105,8 @@ public class Unicopia implements IGuiHandler {
super.registerRecipeTypes(types);
types.put("unicopia:crafting_spell", SpellRecipe::deserialize);
AffineIngredients.instance().load();
}
};

64
src/main/java/com/minelittlepony/unicopia/enchanting/AffineIngredients.java Normal file
View file

@ -0,0 +1,64 @@
package com.minelittlepony.unicopia.enchanting;
import java.util.Map;
import javax.annotation.Nonnull;
import com.google.common.collect.Maps;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.minelittlepony.unicopia.Unicopia;
import com.minelittlepony.util.AssetWalker;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
public class AffineIngredients {
private static final AffineIngredients instance = new AffineIngredients();
public static AffineIngredients instance() {
return instance;
}
private final Map<ResourceLocation, SpellIngredient> storedIngredients = Maps.newHashMap();
private final AssetWalker walker = new AssetWalker(new ResourceLocation(Unicopia.MODID, "enchanting/ingredients"), this::handleJson);
public void load() {
storedIngredients.clear();
walker.walk();
}
public SpellIngredient getIngredient(ResourceLocation res) {
return storedIngredients.get(res);
}
protected void handleJson(ResourceLocation id, JsonObject json) throws JsonParseException {
SpellIngredient ingredient = SpellIngredient.parse(json.get("items"));
if (ingredient != null) {
storedIngredients.put(id, ingredient);
}
}
static class AffineIngredient implements SpellIngredient {
private final ResourceLocation res;
AffineIngredient(ResourceLocation res) {
this.res = res;
}
@Override
public boolean matches(ItemStack other, int materialMult) {
return instance().getIngredient(res).matches(other, materialMult);
}
@Nonnull
static SpellIngredient parse(JsonObject json) {
return new AffineIngredient(new ResourceLocation(json.get("id").getAsString()));
}
}
}

7
src/main/java/com/minelittlepony/unicopia/enchanting/SpellIngredient.java
View file

@ -8,6 +8,7 @@ import com.google.common.collect.Lists;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.minelittlepony.unicopia.enchanting.AffineIngredients.AffineIngredient;
import com.minelittlepony.unicopia.spell.SpellRegistry;
import net.minecraft.item.Item;
@ -92,7 +93,7 @@ public interface SpellIngredient {
}
@Nullable
public static Single parse(JsonObject json) {
public static SpellIngredient parse(JsonObject json) {
Item item = json.has("item") ? Item.getByNameOrId(json.get("item").getAsString()) : null;
if (item != null) {
@ -109,6 +110,10 @@ public interface SpellIngredient {
return new Single(stack, !json.has("data"));
}
if (json.has("id")) {
return AffineIngredient.parse(json);
}
return null;
}
}

11
src/main/resources/assets/unicopia/enchanting/ingredients/blood.json Normal file
View file

@ -0,0 +1,11 @@
{
"items": [
{ "item": "minecraft:red_glazed_terracotta" },
{ "item": "minecraft:dye", "data": 1 },
{ "item": "minecraft:redstone_block" },
{ "item": "minecraft:redstone" },
{ "item": "minecraft:emerald" },
{ "item": "minecraft:ghast_tear" },
{ "item": "minecraft:red_nether_brick" }
]
}

9
src/main/resources/assets/unicopia/enchanting/ingredients/dark.json Normal file
View file

@ -0,0 +1,9 @@
{
"items": [
{ "item": "minecraft:netherbrick" },
{ "item": "minecraft:brick" },
{ "item": "minecraft:red_nether_brick" },
{ "item": "minecraft:coal_block" },
{ "item": "minecraft:coal", "data": 0 }
]
}

8
src/main/resources/assets/unicopia/enchanting/ingredients/energy.json Normal file
View file

@ -0,0 +1,8 @@
{
"items": [
{ "item": "unicopia:zap_apple" },
{ "item": "minecraft:redstone_torch" },
{ "item": "minecraft:redstone_block" },
{ "item": "minecraft:redstone" }
]
}

10
src/main/resources/assets/unicopia/enchanting/ingredients/fire.json Normal file
View file

@ -0,0 +1,10 @@
{
"items": [
{ "item": "minecraft:fire_charge" },
{ "item": "minecraft:magma_cream" },
{ "item": "minecraft:blaze_powder" },
{ "item": "minecraft:blaze_rod" },
{ "item": "minecraft:gold_nugget" },
{ "item": "minecraft:lava_bucket" }
]
}

7
src/main/resources/assets/unicopia/enchanting/ingredients/ice.json Normal file
View file

@ -0,0 +1,7 @@
{
"items": [
{ "item": "minecraft:ghast_tear" },
{ "item": "minecraft:water_bucket" },
{ "item": "minecraft:snowball" }
]
}

10
src/main/resources/assets/unicopia/enchanting/ingredients/life.json Normal file
View file

@ -0,0 +1,10 @@
{
"items": [
{ "item": "minecraft:brown_mushroom" },
{ "item": "unicopia:rotten_apple" },
{ "item": "minecraft:golden_carrot" },
{ "item": "minecraft:wheat" },
{ "item": "minecraft:grain" },
{ "item": "minecraft:alfalfa_leaves" }
]
}

6
src/main/resources/assets/unicopia/enchanting/ingredients/light.json Normal file
View file

@ -0,0 +1,6 @@
{
"items": [
{ "item": "minecraft:glowstone" },
{ "item": "minecraft:glowstone_dust" }
]
}

10
src/main/resources/assets/unicopia/enchanting/ingredients/rot.json Normal file
View file

@ -0,0 +1,10 @@
{
"items": [
{ "item": "minecraft:rotten_flesh" },
{ "item": "unicopia:cloudsdale_tomato", "data": 1 },
{ "item": "unicopia:tomato", "data": 1 },
{ "item": "unicopia:rotten_apple" },
{ "item": "minecraft:red_mushroom" },
{ "item": "minecraft:brown_mushroom" }
]
}

7
src/main/resources/assets/unicopia/enchanting/ingredients/shard.json Normal file
View file

@ -0,0 +1,7 @@
{
"items": [
{ "item": "minecraft:egg" },
{ "item": "minecraft:coal" },
{ "item": "minecraft:flint" }
]
}

8
src/main/resources/assets/unicopia/enchanting/ingredients/shell.json Normal file
View file

@ -0,0 +1,8 @@
{
"items": [
{ "item": "minecraft:egg" },
{ "item": "minecraft:firework_charge" },
{ "item": "minecraft:ender_eye" },
{ "item": "minecraft:fire_charge" }
]
}

8
src/main/resources/assets/unicopia/enchanting/ingredients/sight.json Normal file
View file

@ -0,0 +1,8 @@
{
"items": [
{ "item": "minecraft:ender_eye" },
{ "item": "minecraft:spider_eye" },
{ "item": "minecraft:speckled_mellon" },
{ "item": "minecraft:ender_pearl" }
]
}

9
src/main/resources/assets/unicopia/enchanting/ingredients/unaligned.json Normal file
View file

@ -0,0 +1,9 @@
{
"items": [
{ "item": "minecraft:red_flower" },
{ "item": "minecraft:yellow_flower" },
{ "item": "minecraft:tallgrass" },
{ "item": "minecraft:sapling" },
{ "item": "minecraft:stick" }
]
}

15
src/main/resources/assets/unicopia/enchanting/recipes/awkward.json Normal file
View file

@ -0,0 +1,15 @@
{
"type": "unicopia:crafting_spell",
"ingredients": [
{ "id": "unicopia:unaligned" },
{ "id": "unicopia:unaligned" },
{ "id": "unicopia:unaligned" }
],
"result": {
"item": [
{ "item": "unicopia:gem" },
{ "item": "unicopia:corrupted_gem" }
],
"spell": "awkward"
}
}

4
src/main/resources/assets/unicopia/enchanting/recipes/charge.json
View file

@ -1,9 +1,9 @@
{
"type": "unicopia:crafting_spell",
"ingredients": [
{ "item": "unicopia:zap_apple" },
{ "id": "unicopia:energy" },
{ "item": "unicopia:gem", "spell": "fire" },
{ "item": "minecraft:redstone" }
{ "id": "unicopia:fire" }
],
"result": {
"item": { "item": "unicopia:gem" },

1
src/main/resources/assets/unicopia/enchanting/recipes/drake.json
View file

@ -3,6 +3,7 @@
"ingredients": [
{ "item": "unicopia:gem", "spell": "charge" },
{ "item": "unicopia:corrupted_gem" },
{ "id": "unicopia:life" },
{ "item": "minecraft:red_flower", "data": 0 }
],
"result": {

6
src/main/resources/assets/unicopia/enchanting/recipes/fire.json
View file

@ -1,9 +1,9 @@
{
"type": "unicopia:crafting_spell",
"ingredients": [
{ "item": "minecraft:fire_charge" },
{ "item": "minecraft:fire_charge" },
{ "item": "minecraft:lava_bucket" }
{ "id": "unicopia:fire" },
{ "id": "unicopia:fire" },
{ "id": "unicopia:fire" }
],
"result": {
"item": { "item": "unicopia:gem" },

6
src/main/resources/assets/unicopia/enchanting/recipes/ice.json
View file

@ -1,9 +1,9 @@
{
"type": "unicopia:crafting_spell",
"ingredients": [
{ "item": "minecraft:snowball" },
{ "item": "minecraft:snowball" },
{ "item": "minecraft:water_bucket" }
{ "id": "unicopia:ice" },
{ "id": "unicopia:ice" },
{ "id": "unicopia:ice" }
],
"result": {
"item": { "item": "unicopia:gem" },

4
src/main/resources/assets/unicopia/enchanting/recipes/inferno.json
View file

@ -2,8 +2,8 @@
"type": "unicopia:crafting_spell",
"ingredients": [
{ "item": "unicopia:gem", "spell": "fire" },
{ "item": "minecraft:redstone" },
{ "item": "minecraft:lava_bucket" }
{ "id": "unicopia:fire" },
{ "id": "unicopia:fire" }
],
"result": {
"item": { "item": "unicopia:corrupted_gem" },

9
src/main/resources/assets/unicopia/enchanting/recipes/light.json
View file

@ -1,9 +1,14 @@
{
"type": "unicopia:crafting_spell",
"ingredients": [
{ "item": "minecraft:glowstone_dust" },
{ "id": "unicopia:light" },
{ "item": "unicopia:gem", "spell": "fire" },
{ "item": "unicopia:apple_green" }
[
{ "item": "minecraft:apple" },
{ "item": "unicopia:apple_green" },
{ "item": "unicopia:apple_sweet" },
{ "item": "unicopia:apple_sour" }
]
],
"result": {
"item": { "item": "unicopia:gem" },

6
src/main/resources/assets/unicopia/enchanting/recipes/necromancy.json
View file

@ -1,9 +1,9 @@
{
"type": "unicopia:crafting_spell",
"ingredients": [
{ "item": "minecraft:dye", "data": 1 },
{ "item": "minecraft:redstone" },
{ "item": "minecraft:rotten_flesh" }
{ "id": "unicopia:blood" },
{ "id": "unicopia:energy" },
{ "id": "unicopia:rot" }
],
"result": {
"item": { "item": "unicopia:corrupted_gem" },

4
src/main/resources/assets/unicopia/enchanting/recipes/portal.json
View file

@ -1,9 +1,9 @@
{
"type": "unicopia:crafting_spell",
"ingredients": [
{ "item": "minecraft:ender_pearl" },
{ "id": "unicopia:sight" },
{ "item": "minecraft:ghast_tear" },
{ "item": "minecraft:redstone" },
{ "id": "unicopia:energy" },
{ "item": "unicopia:gem", "spell": "fire" }
],
"result": {

6
src/main/resources/assets/unicopia/enchanting/recipes/repulsion.json
View file

@ -1,10 +1,10 @@
{
"type": "unicopia:crafting_spell",
"ingredients": [
{ "item": "minecraft:firework_charge" },
{ "item": "minecraft:fire_charge" },
{ "id": "unicopia:fire" },
{ "id": "unicopia:shell" },
{ "item": "unicopia:gem", "spell": "shield" },
{ "item": "minecraft:egg" }
{ "id": "unicopia:shell" }
],
"result": {
"item": { "item": "unicopia:corrupted_gem" },

6
src/main/resources/assets/unicopia/enchanting/recipes/shield.json
View file

@ -1,9 +1,9 @@
{
"type": "unicopia:crafting_spell",
"ingredients": [
{ "item": "minecraft:egg" },
{ "item": "minecraft:coal" },
{ "item": "minecraft:blaze_powder" }
{ "id": "unicopia:shell" },
{ "id": "unicopia:shell" },
{ "id": "unicopia:shard" }
],
"result": {
"item": { "item": "unicopia:gem" },

1
src/main/resources/assets/unicopia/enchanting/recipes/suffering.json
View file

@ -2,6 +2,7 @@
"type": "unicopia:crafting_spell",
"ingredients": [
{ "item": "minecraft:fire_charge" },
{ "id": "unicopia:bloood" },
{ "item": "unicopia:gem", "spell": "fire" }
],
"result": {

2
src/main/resources/assets/unicopia/enchanting/recipes/vortex.json
View file

@ -1,7 +1,7 @@
{
"type": "unicopia:crafting_spell",
"ingredients": [
{ "item": "minecraft:egg" },
{ "id": "unicopia:shell" },
{ "item": "unicopia:gem", "spell": "shield" },
{ "item": "unicopia:gem", "spell": "portal" }
],