some patchouli fixes

Closes #234
This commit is contained in:
Ell 2021-12-28 11:53:10 +01:00
parent 8c74322ee9
commit 20a3969943
350 changed files with 925 additions and 924 deletions

View file

@ -107,8 +107,8 @@ dependencies {
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")
compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.1-61:api")
runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.1-61")
compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.1-63:api")
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")
compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.18.1-5.0.3.0:api")

View file

@ -24,7 +24,7 @@ public class ProcessorAltar implements IComponentProcessor {
case "output" -> IVariable.from(this.recipe.output);
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 "name" -> IVariable.wrap(this.recipe.output.getDisplayName().getString());
case "name" -> IVariable.wrap(this.recipe.output.getHoverName().getString());
default -> null;
};
}

View file

@ -22,7 +22,7 @@ public class ProcessorOffering implements IComponentProcessor {
case "input" -> PatchouliCompat.ingredientVariable(this.recipe.input);
case "output" -> IVariable.from(this.recipe.output);
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;
};
}

View file

@ -25,7 +25,7 @@ public class ProcessorTreeRitual implements IComponentProcessor {
return switch (key) {
case "output" -> IVariable.from(this.recipe.result);
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;
};
}

View file

@ -265,7 +265,7 @@ public class ClientEvents {
var scale = 0.75F;
stack.pushPose();
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);
stack.popPose();
@ -359,7 +359,7 @@ public class ClientEvents {
var state = mc.level.getBlockState(pos);
var blockStack = state.getBlock().getCloneItemStack(state, blockHitResult, mc.level, pos, mc.player);
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) {
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);
if (stackCont != null) {
this.drawContainerInfo(stack, stackCont.getStoredAura(), stackCont.getMaxAura(), stackCont.getAuraColor(),
mc, res, 55, tileStack.getDisplayName().getString(), null);
mc, res, 55, tileStack.getHoverName().getString(), null);
}
}
}

View file

@ -2,13 +2,13 @@
"processor": "de.ellpeck.naturesaura.compat.patchouli.ProcessorAltar",
"components": [
{
"type": "item",
"type": "patchouli:item",
"item": "#input",
"x": 14,
"y": 26
},
{
"type": "item",
"type": "patchouli:item",
"item": "#output",
"x": 82,
"y": 26,
@ -16,26 +16,26 @@
},
{
"group": "catalyst",
"type": "item",
"type": "patchouli:item",
"item": "#catalyst",
"x": 36,
"y": 26
},
{
"type": "item",
"type": "patchouli:item",
"item": "#type",
"x": 58,
"y": 26
},
{
"group": "altar",
"type": "item",
"type": "patchouli:item",
"item": "naturesaura:nature_altar",
"x": 36,
"y": 26
},
{
"type": "image",
"type": "patchouli:image",
"image": "naturesaura:textures/gui/patchouli/elements.png",
"x": 10,
"y": 13,
@ -45,13 +45,13 @@
"height": 44
},
{
"type": "header",
"type": "patchouli:header",
"text": "#name",
"x": -1,
"y": 0
},
{
"type": "text",
"type": "patchouli:text",
"text": "#text",
"x": 0,
"y": 63

View file

@ -2,38 +2,38 @@
"processor": "de.ellpeck.naturesaura.compat.patchouli.ProcessorAnimalSpawner",
"components": [
{
"type": "item",
"type": "patchouli:item",
"item": "#input1",
"x": 12,
"y": 100
},
{
"type": "item",
"type": "patchouli:item",
"item": "#input2",
"x": 36,
"y": 100
},
{
"type": "item",
"type": "patchouli:item",
"item": "#input3",
"x": 60,
"y": 100
},
{
"type": "item",
"type": "patchouli:item",
"item": "#input4",
"x": 84,
"y": 100
},
{
"type": "entity",
"type": "patchouli:entity",
"entity": "#entity",
"x": 56,
"y": 60,
"render_size": 60
},
{
"type": "image",
"type": "patchouli:image",
"image": "naturesaura:textures/gui/patchouli/elements.png",
"x": 8,
"y": 10,
@ -43,19 +43,19 @@
"height": 110
},
{
"type": "header",
"type": "patchouli:header",
"text": "#name",
"x": -1,
"y": 0
},
{
"type": "text",
"type": "patchouli:text",
"text": "#text",
"x": 0,
"y": 122
},
{
"type": "item",
"type": "patchouli:item",
"item": "#egg",
"x": 0,
"y": 0,

Some files were not shown because too many files have changed in this diff Show more