mirror of
https://github.com/Ellpeck/NaturesAura.git
synced 2024-11-22 11:53:29 +01:00
parent
8c74322ee9
commit
20a3969943
350 changed files with 925 additions and 924 deletions
|
|
@ -107,8 +107,8 @@ dependencies {
|
||||||
compileOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.47:api")
|
compileOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.47:api")
|
||||||
runtimeOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.47")
|
runtimeOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.47")
|
||||||
|
|
||||||
compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.1-61:api")
|
compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.1-63:api")
|
||||||
runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.1-61")
|
runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.1-63")
|
||||||
|
|
||||||
runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.18.1-5.0.3.0")
|
runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.18.1-5.0.3.0")
|
||||||
compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.18.1-5.0.3.0:api")
|
compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.18.1-5.0.3.0:api")
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ public class ProcessorAltar implements IComponentProcessor {
|
||||||
case "output" -> IVariable.from(this.recipe.output);
|
case "output" -> IVariable.from(this.recipe.output);
|
||||||
case "catalyst" -> this.recipe.catalyst != Ingredient.EMPTY ? PatchouliCompat.ingredientVariable(this.recipe.catalyst) : null;
|
case "catalyst" -> this.recipe.catalyst != Ingredient.EMPTY ? PatchouliCompat.ingredientVariable(this.recipe.catalyst) : null;
|
||||||
case "type" -> this.recipe.requiredType != null ? IVariable.from(this.recipe.getDimensionBottle()) : null;
|
case "type" -> this.recipe.requiredType != null ? IVariable.from(this.recipe.getDimensionBottle()) : null;
|
||||||
case "name" -> IVariable.wrap(this.recipe.output.getDisplayName().getString());
|
case "name" -> IVariable.wrap(this.recipe.output.getHoverName().getString());
|
||||||
default -> null;
|
default -> null;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ public class ProcessorOffering implements IComponentProcessor {
|
||||||
case "input" -> PatchouliCompat.ingredientVariable(this.recipe.input);
|
case "input" -> PatchouliCompat.ingredientVariable(this.recipe.input);
|
||||||
case "output" -> IVariable.from(this.recipe.output);
|
case "output" -> IVariable.from(this.recipe.output);
|
||||||
case "start" -> PatchouliCompat.ingredientVariable(this.recipe.startItem);
|
case "start" -> PatchouliCompat.ingredientVariable(this.recipe.startItem);
|
||||||
case "name" -> IVariable.wrap(this.recipe.output.getDisplayName().getString());
|
case "name" -> IVariable.wrap(this.recipe.output.getHoverName().getString());
|
||||||
default -> null;
|
default -> null;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ public class ProcessorTreeRitual implements IComponentProcessor {
|
||||||
return switch (key) {
|
return switch (key) {
|
||||||
case "output" -> IVariable.from(this.recipe.result);
|
case "output" -> IVariable.from(this.recipe.result);
|
||||||
case "sapling" -> PatchouliCompat.ingredientVariable(this.recipe.saplingType);
|
case "sapling" -> PatchouliCompat.ingredientVariable(this.recipe.saplingType);
|
||||||
case "name" -> IVariable.wrap(this.recipe.result.getDisplayName().getString());
|
case "name" -> IVariable.wrap(this.recipe.result.getHoverName().getString());
|
||||||
default -> null;
|
default -> null;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -265,7 +265,7 @@ public class ClientEvents {
|
||||||
var scale = 0.75F;
|
var scale = 0.75F;
|
||||||
stack.pushPose();
|
stack.pushPose();
|
||||||
stack.scale(scale, scale, scale);
|
stack.scale(scale, scale, scale);
|
||||||
var s = heldCache.getDisplayName().getString();
|
var s = heldCache.getHoverName().getString();
|
||||||
mc.font.drawShadow(stack, s, conf == 1 ? x / scale : (x + 80) / scale - mc.font.width(s), (y - 7) / scale, color);
|
mc.font.drawShadow(stack, s, conf == 1 ? x / scale : (x + 80) / scale - mc.font.width(s), (y - 7) / scale, color);
|
||||||
stack.popPose();
|
stack.popPose();
|
||||||
|
|
||||||
|
|
@ -359,7 +359,7 @@ public class ClientEvents {
|
||||||
var state = mc.level.getBlockState(pos);
|
var state = mc.level.getBlockState(pos);
|
||||||
var blockStack = state.getBlock().getCloneItemStack(state, blockHitResult, mc.level, pos, mc.player);
|
var blockStack = state.getBlock().getCloneItemStack(state, blockHitResult, mc.level, pos, mc.player);
|
||||||
this.drawContainerInfo(stack, container.getStoredAura(), container.getMaxAura(), container.getAuraColor(),
|
this.drawContainerInfo(stack, container.getStoredAura(), container.getMaxAura(), container.getAuraColor(),
|
||||||
mc, res, 35, blockStack.getDisplayName().getString(), null);
|
mc, res, 35, blockStack.getHoverName().getString(), null);
|
||||||
|
|
||||||
if (tile instanceof BlockEntityNatureAltar) {
|
if (tile instanceof BlockEntityNatureAltar) {
|
||||||
var tileStack = ((BlockEntityNatureAltar) tile).getItemHandler().getStackInSlot(0);
|
var tileStack = ((BlockEntityNatureAltar) tile).getItemHandler().getStackInSlot(0);
|
||||||
|
|
@ -367,7 +367,7 @@ public class ClientEvents {
|
||||||
var stackCont = tileStack.getCapability(NaturesAuraAPI.CAP_AURA_CONTAINER, null).orElse(null);
|
var stackCont = tileStack.getCapability(NaturesAuraAPI.CAP_AURA_CONTAINER, null).orElse(null);
|
||||||
if (stackCont != null) {
|
if (stackCont != null) {
|
||||||
this.drawContainerInfo(stack, stackCont.getStoredAura(), stackCont.getMaxAura(), stackCont.getAuraColor(),
|
this.drawContainerInfo(stack, stackCont.getStoredAura(), stackCont.getMaxAura(), stackCont.getAuraColor(),
|
||||||
mc, res, 55, tileStack.getDisplayName().getString(), null);
|
mc, res, 55, tileStack.getHoverName().getString(), null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,60 +1,60 @@
|
||||||
{
|
{
|
||||||
"processor": "de.ellpeck.naturesaura.compat.patchouli.ProcessorAltar",
|
"processor": "de.ellpeck.naturesaura.compat.patchouli.ProcessorAltar",
|
||||||
"components": [
|
"components": [
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "patchouli:item",
|
||||||
"item": "#input",
|
"item": "#input",
|
||||||
"x": 14,
|
"x": 14,
|
||||||
"y": 26
|
"y": 26
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "patchouli:item",
|
||||||
"item": "#output",
|
"item": "#output",
|
||||||
"x": 82,
|
"x": 82,
|
||||||
"y": 26,
|
"y": 26,
|
||||||
"link_recipe": true
|
"link_recipe": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"group": "catalyst",
|
"group": "catalyst",
|
||||||
"type": "item",
|
"type": "patchouli:item",
|
||||||
"item": "#catalyst",
|
"item": "#catalyst",
|
||||||
"x": 36,
|
"x": 36,
|
||||||
"y": 26
|
"y": 26
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "patchouli:item",
|
||||||
"item": "#type",
|
"item": "#type",
|
||||||
"x": 58,
|
"x": 58,
|
||||||
"y": 26
|
"y": 26
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"group": "altar",
|
"group": "altar",
|
||||||
"type": "item",
|
"type": "patchouli:item",
|
||||||
"item": "naturesaura:nature_altar",
|
"item": "naturesaura:nature_altar",
|
||||||
"x": 36,
|
"x": 36,
|
||||||
"y": 26
|
"y": 26
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "image",
|
"type": "patchouli:image",
|
||||||
"image": "naturesaura:textures/gui/patchouli/elements.png",
|
"image": "naturesaura:textures/gui/patchouli/elements.png",
|
||||||
"x": 10,
|
"x": 10,
|
||||||
"y": 13,
|
"y": 13,
|
||||||
"u": 0,
|
"u": 0,
|
||||||
"v": 0,
|
"v": 0,
|
||||||
"width": 91,
|
"width": 91,
|
||||||
"height": 44
|
"height": 44
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "header",
|
"type": "patchouli:header",
|
||||||
"text": "#name",
|
"text": "#name",
|
||||||
"x": -1,
|
"x": -1,
|
||||||
"y": 0
|
"y": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "text",
|
"type": "patchouli:text",
|
||||||
"text": "#text",
|
"text": "#text",
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 63
|
"y": 63
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -1,66 +1,66 @@
|
||||||
{
|
{
|
||||||
"processor": "de.ellpeck.naturesaura.compat.patchouli.ProcessorAnimalSpawner",
|
"processor": "de.ellpeck.naturesaura.compat.patchouli.ProcessorAnimalSpawner",
|
||||||
"components": [
|
"components": [
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "patchouli:item",
|
||||||
"item": "#input1",
|
"item": "#input1",
|
||||||
"x": 12,
|
"x": 12,
|
||||||
"y": 100
|
"y": 100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "patchouli:item",
|
||||||
"item": "#input2",
|
"item": "#input2",
|
||||||
"x": 36,
|
"x": 36,
|
||||||
"y": 100
|
"y": 100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "patchouli:item",
|
||||||
"item": "#input3",
|
"item": "#input3",
|
||||||
"x": 60,
|
"x": 60,
|
||||||
"y": 100
|
"y": 100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "patchouli:item",
|
||||||
"item": "#input4",
|
"item": "#input4",
|
||||||
"x": 84,
|
"x": 84,
|
||||||
"y": 100
|
"y": 100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "entity",
|
"type": "patchouli:entity",
|
||||||
"entity": "#entity",
|
"entity": "#entity",
|
||||||
"x": 56,
|
"x": 56,
|
||||||
"y": 60,
|
"y": 60,
|
||||||
"render_size": 60
|
"render_size": 60
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "image",
|
"type": "patchouli:image",
|
||||||
"image": "naturesaura:textures/gui/patchouli/elements.png",
|
"image": "naturesaura:textures/gui/patchouli/elements.png",
|
||||||
"x": 8,
|
"x": 8,
|
||||||
"y": 10,
|
"y": 10,
|
||||||
"u": 0,
|
"u": 0,
|
||||||
"v": 131,
|
"v": 131,
|
||||||
"width": 96,
|
"width": 96,
|
||||||
"height": 110
|
"height": 110
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "header",
|
"type": "patchouli:header",
|
||||||
"text": "#name",
|
"text": "#name",
|
||||||
"x": -1,
|
"x": -1,
|
||||||
"y": 0
|
"y": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "text",
|
"type": "patchouli:text",
|
||||||
"text": "#text",
|
"text": "#text",
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 122
|
"y": 122
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "item",
|
"type": "patchouli:item",
|
||||||
"item": "#egg",
|
"item": "#egg",
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
"link_recipe": true,
|
"link_recipe": true,
|
||||||
"group": "seekrit"
|
"group": "seekrit"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue