Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"parent": "minecraft:item/generated",
"overrides": [
{
"model": "hexcasting:item/robes/boots",
"predicate": {
"hexcasting:variant": 0.0
}
},
{
"model": "hexcasting:item/robes/boots_1",
"predicate": {
"hexcasting:variant": 1.0
}
},
{
"model": "hexcasting:item/robes/boots_2",
"predicate": {
"hexcasting:variant": 2.0
}
}
],
"textures": {
"layer0": "hexcasting:item/robes/0_boots"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/robes/1_boots"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/robes/2_boots"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"parent": "minecraft:item/generated",
"overrides": [
{
"model": "hexcasting:item/robes/hood",
"predicate": {
"hexcasting:variant": 0.0
}
},
{
"model": "hexcasting:item/robes/hood_1",
"predicate": {
"hexcasting:variant": 1.0
}
},
{
"model": "hexcasting:item/robes/hood_2",
"predicate": {
"hexcasting:variant": 2.0
}
}
],
"textures": {
"layer0": "hexcasting:item/robes/0_hood"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/robes/1_hood"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/robes/2_hood"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"parent": "minecraft:item/generated",
"overrides": [
{
"model": "hexcasting:item/robes/legs",
"predicate": {
"hexcasting:variant": 0.0
}
},
{
"model": "hexcasting:item/robes/legs_1",
"predicate": {
"hexcasting:variant": 1.0
}
},
{
"model": "hexcasting:item/robes/legs_2",
"predicate": {
"hexcasting:variant": 2.0
}
}
],
"textures": {
"layer0": "hexcasting:item/robes/0_legs"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/robes/1_legs"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/robes/2_legs"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"parent": "minecraft:item/generated",
"overrides": [
{
"model": "hexcasting:item/robes/tunic",
"predicate": {
"hexcasting:variant": 0.0
}
},
{
"model": "hexcasting:item/robes/tunic_1",
"predicate": {
"hexcasting:variant": 1.0
}
},
{
"model": "hexcasting:item/robes/tunic_2",
"predicate": {
"hexcasting:variant": 2.0
}
}
],
"textures": {
"layer0": "hexcasting:item/robes/0_tunic"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/robes/1_tunic"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "hexcasting:item/robes/2_tunic"
}
}
14 changes: 0 additions & 14 deletions Common/src/main/java/at/petrak/hexcasting/api/HexAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -158,20 +158,6 @@ default FrozenPigment getColorizer(Player player) {
return FrozenPigment.DEFAULT.get();
}

ArmorMaterial DUMMY_ARMOR_MATERIAL = new ArmorMaterial(
Collections.emptyMap(),
0,
SoundEvents.ARMOR_EQUIP_LEATHER,
() -> Ingredient.EMPTY,
Collections.emptyList(),
0,
0
);

default ArmorMaterial robesMaterial() {
return DUMMY_ARMOR_MATERIAL;
}

/**
* Location in the userdata of the ravenmind
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ public static void init() {
registerVariantOverrides(HexItems.CYPHER.get(), HexItems.CYPHER.get()::getVariant);
registerVariantOverrides(HexItems.TRINKET.get(), HexItems.TRINKET.get()::getVariant);
registerVariantOverrides(HexItems.ARTIFACT.get(), HexItems.ARTIFACT.get()::getVariant);
registerVariantOverrides(HexItems.ROBES_HOOD.get(), HexItems.ROBES_HOOD.get()::getVariant);
registerVariantOverrides(HexItems.ROBES_TUNIC.get(), HexItems.ROBES_TUNIC.get()::getVariant);
registerVariantOverrides(HexItems.ROBES_LEGS.get(), HexItems.ROBES_LEGS.get()::getVariant);
registerVariantOverrides(HexItems.ROBES_BOOTS.get(), HexItems.ROBES_BOOTS.get()::getVariant);
IClientXplatAbstractions.INSTANCE.registerItemProperty(HexItems.THOUGHT_KNOT.get(), ItemThoughtKnot.WRITTEN_PRED,
(stack, level, holder, holderID) -> {
if (stack.has(HexDataComponents.IOTA_HOLDER_IOTA.get())) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
public class HexModelLayers {
public static final ModelLayerLocation ALTIORA = make("altiora");

public static final ModelLayerLocation ROBES = make("robes");
public static final ModelLayerLocation ROBES_0 = make("robes_0");
public static final ModelLayerLocation ROBES_1 = make("robes_1");
public static final ModelLayerLocation ROBES_2 = make("robes_2");

private static ModelLayerLocation make(String name) {
return make(name, "main");
Expand All @@ -29,6 +31,8 @@ private static ModelLayerLocation make(String name, String layer) {
// https://github.com/VazkiiMods/Botania/blob/1.19.x/Xplat/src/main/java/vazkii/botania/client/model/BotaniaLayerDefinitions.java
public static void init(BiConsumer<ModelLayerLocation, Supplier<LayerDefinition>> consumer) {
consumer.accept(ALTIORA, ElytraModel::createLayer);
consumer.accept(ROBES, HexRobesModels::variant1);
consumer.accept(ROBES_0, HexRobesModel::variant0);
consumer.accept(ROBES_1, HexRobesModel::variant1);
consumer.accept(ROBES_2, HexRobesModel::variant2);
}
}
Loading
Loading