Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@LeoLezury
LeoLezury committed Jul 24, 2024
1 parent e678c84 commit 2bb9afe
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 24 deletions.
14 changes: 7 additions & 7 deletions src/generated/resources/.cache/2db82bc4898868f7eec79958ed07d46c99c9af46
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
// 1.21 2024-07-22T20:16:19.5913157 Item Models: assorted_armaments
// 1.21 2024-07-24T13:22:07.3922018 Item Models: assorted_armaments
9f5ce353cc483273242470fac8e74e0999b4efeb assets/assorted_armaments/models/item/diamond_claymore.json
1f15a0020d5f44de2b673f75da3664427b52ccfe assets/assorted_armaments/models/item/diamond_claymore_blocking.json
1c2ff54384d1ded71022bea0c27159a13a41fc6c assets/assorted_armaments/models/item/diamond_claymore_inventory.json
caa654a919c1bcb0c516aa01989ae71036b3b464 assets/assorted_armaments/models/item/diamond_claymore_inventory.json
9ddc7cd86e7671d2f5abc69f667476255ba549b8 assets/assorted_armaments/models/item/diamond_flail.json
085f0a853171f5917ff9698e7e31d2e33bd9347d assets/assorted_armaments/models/item/diamond_flail_spinning.json
fc9a049ff14b2552e31856d2e8981cd6835c6b22 assets/assorted_armaments/models/item/diamond_mace.json
9619c9e457df4c09222ac0940dd12ec577d2bff9 assets/assorted_armaments/models/item/golden_claymore.json
6665a03a5233a294963319da5b68eb95cd00ce5c assets/assorted_armaments/models/item/golden_claymore_blocking.json
b99081f7ea7c7ec428b2ccc0d4484c0cd3e7eeda assets/assorted_armaments/models/item/golden_claymore_inventory.json
e6369e8486f6a71fc1ba1011219d2aa9f2670b5b assets/assorted_armaments/models/item/golden_claymore_inventory.json
3954961a9d383e18837608191bd26c86d7cf098d assets/assorted_armaments/models/item/golden_flail.json
017150fa71101b263d516c1a292a28111a1f1ae5 assets/assorted_armaments/models/item/golden_flail_spinning.json
0f7a9420d0630c951c4de44697a6d753aebc65c5 assets/assorted_armaments/models/item/golden_mace.json
71d39dc9a3105364a3ea8c92880c32a4597529c4 assets/assorted_armaments/models/item/iron_claymore.json
f13d51ffd2add96ae573fd701fd90bfcc310f59d assets/assorted_armaments/models/item/iron_claymore_blocking.json
f7c7b38356c450a067560d6cd48dd062150f3958 assets/assorted_armaments/models/item/iron_claymore_inventory.json
c690e076268fb50008a06051e0b5338afbc9faf0 assets/assorted_armaments/models/item/iron_claymore_inventory.json
26d47d8fe26caf0af7960f67f6c3d94c610966e9 assets/assorted_armaments/models/item/iron_flail.json
e0743cdc51e63eda7701b1d78f35ebb84da8dfb5 assets/assorted_armaments/models/item/iron_flail_spinning.json
48e82205f3e84627c516a2393790171080a68f4f assets/assorted_armaments/models/item/iron_mace.json
c315f5bf8d2372b2719696373384ad59b3c5a431 assets/assorted_armaments/models/item/netherite_claymore.json
eda89a2e4667f95ec719a18a4b3ec377fff48948 assets/assorted_armaments/models/item/netherite_claymore_blocking.json
110a66c24c32b3bd29f9777efe19d9cc769230b4 assets/assorted_armaments/models/item/netherite_claymore_inventory.json
0aab1d8c4cdbebb1132a8d25ee3d06024c36ae7b assets/assorted_armaments/models/item/netherite_claymore_inventory.json
49c8e5852327c5a19b09c997139f6c3a1460dffe assets/assorted_armaments/models/item/netherite_flail.json
a0325fb1341f5661c023054a97d928c5d4c756c8 assets/assorted_armaments/models/item/netherite_flail_spinning.json
3dc57528b72903e8c4fff3cb6fa3739e11f3e279 assets/assorted_armaments/models/item/netherite_mace.json
daed45eaf2b96d5097c98791f81946fd672a1f95 assets/assorted_armaments/models/item/stone_claymore.json
ef0be2fb9c4a35f869878cf4aae153891db53764 assets/assorted_armaments/models/item/stone_claymore_blocking.json
f81ac86f2a25cecb4949bb78e65e487895f14150 assets/assorted_armaments/models/item/stone_claymore_inventory.json
20a679c6ab981b1215b5e14c2c144523fb6cf877 assets/assorted_armaments/models/item/stone_claymore_inventory.json
b0aa2674baa33ec4e4e1565e260d3a0dc80e7c29 assets/assorted_armaments/models/item/stone_flail.json
9708a2bcb37b13db86dce6820937f9754c56a87a assets/assorted_armaments/models/item/stone_flail_spinning.json
26c4850fd8bb36666f6e16b090a7a306b0e536d8 assets/assorted_armaments/models/item/stone_mace.json
fff5e484d6ed448fd747ae1d9c5f191f9f42997f assets/assorted_armaments/models/item/wooden_claymore.json
1d4ebe2e7400716b793444ec422fbcbad50de24a assets/assorted_armaments/models/item/wooden_claymore_blocking.json
7769febb5b9173a3405449255fcfb26b53ad50f9 assets/assorted_armaments/models/item/wooden_claymore_inventory.json
490674d591b6580e8e8de35ae66aa1bd042fd632 assets/assorted_armaments/models/item/wooden_claymore_inventory.json
c6cd571f460d73a33bf59ba7ff90457bafdaae3f assets/assorted_armaments/models/item/wooden_flail.json
67d3e1eec319b1bcd6417a331e3395839550a8d9 assets/assorted_armaments/models/item/wooden_flail_spinning.json
ae00e6edfec471f1ba4e9955a3293ff8e01f4603 assets/assorted_armaments/models/item/wooden_mace.json
2 changes: 1 addition & 1 deletion ...generated/resources/assets/assorted_armaments/models/item/diamond_claymore_inventory.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:item/generated",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "assorted_armaments:item/diamond_claymore_inventory"
}
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/assorted_armaments/models/item/golden_claymore_inventory.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:item/generated",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "assorted_armaments:item/golden_claymore_inventory"
}
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/assorted_armaments/models/item/iron_claymore_inventory.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:item/generated",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "assorted_armaments:item/iron_claymore_inventory"
}
Expand Down
2 changes: 1 addition & 1 deletion ...nerated/resources/assets/assorted_armaments/models/item/netherite_claymore_inventory.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:item/generated",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "assorted_armaments:item/netherite_claymore_inventory"
}
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/assorted_armaments/models/item/stone_claymore_inventory.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:item/generated",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "assorted_armaments:item/stone_claymore_inventory"
}
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/assorted_armaments/models/item/wooden_claymore_inventory.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:item/generated",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "assorted_armaments:item/wooden_claymore_inventory"
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/team/leomc/assortedarmaments/client/event/AAClientSetupEvents.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ private static void onModifyBakingResult(ModelEvent.ModifyBakingResult event) {
@Override
public BakedModel applyTransform(ItemDisplayContext cameraTransformType, PoseStack poseStack, boolean applyLeftHandTransform) {
if (ITEMS_WITH_SPECIAL_MODELS.get(location).containsKey(cameraTransformType)) {
return BAKED_MODELS.get(ITEMS_WITH_SPECIAL_MODELS.get(location).get(cameraTransformType));
return BAKED_MODELS.get(ITEMS_WITH_SPECIAL_MODELS.get(location).get(cameraTransformType)).applyTransform(cameraTransformType, poseStack, applyLeftHandTransform);
}
return super.applyTransform(cameraTransformType, poseStack, applyLeftHandTransform);
}
Expand All @@ -183,7 +183,7 @@ public BakedModel applyTransform(ItemDisplayContext cameraTransformType, PoseSta
@Override
public BakedModel applyTransform(ItemDisplayContext cameraTransformType, PoseStack poseStack, boolean applyLeftHandTransform) {
if (ITEMS_WITH_SPECIAL_MODELS.get(location).containsKey(cameraTransformType)) {
return BAKED_MODELS.get(ITEMS_WITH_SPECIAL_MODELS.get(location).get(cameraTransformType));
return BAKED_MODELS.get(ITEMS_WITH_SPECIAL_MODELS.get(location).get(cameraTransformType)).applyTransform(cameraTransformType, poseStack, applyLeftHandTransform);
}
return super.applyTransform(cameraTransformType, poseStack, applyLeftHandTransform);
}
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/team/leomc/assortedarmaments/data/gen/model/AAItemModelProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ public AAItemModelProvider(PackOutput output, ExistingFileHelper existingFileHel
@Override
protected void registerModels() {
claymore(AAItems.WOODEN_CLAYMORE.get());
inventoryModel(AAItems.WOODEN_CLAYMORE.get());
inventoryHandheld(AAItems.WOODEN_CLAYMORE.get());
claymore(AAItems.STONE_CLAYMORE.get());
inventoryModel(AAItems.STONE_CLAYMORE.get());
inventoryHandheld(AAItems.STONE_CLAYMORE.get());
claymore(AAItems.IRON_CLAYMORE.get());
inventoryModel(AAItems.IRON_CLAYMORE.get());
inventoryHandheld(AAItems.IRON_CLAYMORE.get());
claymore(AAItems.DIAMOND_CLAYMORE.get());
inventoryModel(AAItems.DIAMOND_CLAYMORE.get());
inventoryHandheld(AAItems.DIAMOND_CLAYMORE.get());
claymore(AAItems.GOLDEN_CLAYMORE.get());
inventoryModel(AAItems.GOLDEN_CLAYMORE.get());
inventoryHandheld(AAItems.GOLDEN_CLAYMORE.get());
claymore(AAItems.NETHERITE_CLAYMORE.get());
inventoryModel(AAItems.NETHERITE_CLAYMORE.get());
inventoryHandheld(AAItems.NETHERITE_CLAYMORE.get());

handheld(AAItems.WOODEN_MACE.get());
handheld(AAItems.STONE_MACE.get());
Expand Down Expand Up @@ -90,9 +90,9 @@ private ItemModelBuilder spinningFlail(Item item) {
.texture("particle", itemTexture(item));
}

private ItemModelBuilder inventoryModel(Item item) {
private ItemModelBuilder inventoryHandheld(Item item) {
return getBuilder(item.toString() + "_inventory")
.parent(new ModelFile.UncheckedModelFile("item/generated"))
.parent(new ModelFile.UncheckedModelFile("item/handheld"))
.texture("layer0", itemTexture(item) + "_inventory");
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assorted_armaments.mixins.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"minVersion": "0.8",
"package": "team.leomc.assortedarmaments.mixin",
"compatibilityLevel": "JAVA_8",
"refmap": "bcs_expedition_world.refmap.json",
"refmap": "assorted_armaments.refmap.json",
"mixins": [
"ItemStackMixin",
"LivingEntityMixin",
Expand Down

0 comments on commit 2bb9afe

Please sign in to comment.