Skip to content

Commit 6ef75e6

Browse files
Smartin-bSmartin-b
committed
- fixed EF crash
1 parent 01d7a00 commit 6ef75e6

34 files changed

+263
-16
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@
66
- added config option to allow Items to go into a Broken state instead of fully breaking, similar to vanillas elytra behaviour
77
- fix module list scrolling to the top on gui update
88
- added config to shielding_armor positions
9-
- added "can_child_be_empty" property to allow blocking of the Empty Slot Crafting Option
9+
- added "can_child_be_empty" property to allow blocking of the Empty Slot Crafting Option
10+
- removed EF property for now (EF is still supported, this was just a fancier way for support that we didn't use)
11+
- added tags to miapi, c, minecraft and forge for armor, helmets, chestplates, leggings, boots, swords, knifes, tools, axes, pickaxes, shovels, hoes, bows, crossbows

‎common/src/main/resources/data/c/tags/items/bows.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_bow",
5+
"miapi:modular_small_bow",
6+
"miapi:modular_large_bow"
7+
]
8+
}

‎common/src/main/resources/data/c/tags/items/crossbows.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_crossbow",
5+
"miapi:modular_small_crossbow",
6+
"miapi:modular_large_crossbow"
7+
]
8+
}

‎common/src/main/resources/data/forge/tags/items/armor.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_helmet",
5+
"miapi:modular_chestplate",
6+
"miapi:modular_elytra",
7+
"miapi:modular_leggings",
8+
"miapi:modular_boots"
9+
]
10+
}

‎common/src/main/resources/data/forge/tags/items/axes.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_axe",
5+
"miapi:modular_mattock"
6+
]
7+
}

‎common/src/main/resources/data/forge/tags/items/boots.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_boots"
5+
]
6+
}

‎common/src/main/resources/data/forge/tags/items/bows.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_bow",
5+
"miapi:modular_small_bow",
6+
"miapi:modular_large_bow"
7+
]
8+
}

‎common/src/main/resources/data/forge/tags/items/chestplates.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_chestplate",
5+
"miapi:modular_elytra"
6+
]
7+
}

‎common/src/main/resources/data/forge/tags/items/crossbows.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_crossbow",
5+
"miapi:modular_small_crossbow",
6+
"miapi:modular_large_crossbow"
7+
]
8+
}

‎common/src/main/resources/data/forge/tags/items/helmets.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_helmet"
5+
]
6+
}

‎common/src/main/resources/data/forge/tags/items/hoes.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_hoe",
5+
"miapi:modular_scythe",
6+
"miapi:modular_sickle"
7+
]
8+
}

‎common/src/main/resources/data/forge/tags/items/knifes.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_dagger",
5+
"miapi:modular_throwing_knife"
6+
]
7+
}

‎common/src/main/resources/data/forge/tags/items/leggings.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_leggings"
5+
]
6+
}

‎common/src/main/resources/data/forge/tags/items/pickaxes.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_pickaxe",
5+
"miapi:modular_hammer",
6+
"miapi:modular_mattock"
7+
]
8+
}

‎common/src/main/resources/data/forge/tags/items/shovels.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_shovel"
5+
]
6+
}

‎common/src/main/resources/data/forge/tags/items/swords.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_handle",
5+
"miapi:modular_sword",
6+
"miapi:modular_katana",
7+
"miapi:modular_naginata",
8+
"miapi:modular_greatsword",
9+
"miapi:modular_dagger",
10+
"miapi:modular_spear",
11+
"miapi:modular_throwing_knife",
12+
"miapi:modular_rapier",
13+
"miapi:modular_longsword",
14+
"miapi:modular_trident",
15+
"miapi:modular_scythe",
16+
"miapi:modular_sickle"
17+
]
18+
}

‎common/src/main/resources/data/forge/tags/items/tools.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_shovel",
5+
"miapi:modular_pickaxe",
6+
"miapi:modular_hammer",
7+
"miapi:modular_axe",
8+
"miapi:modular_hoe",
9+
"miapi:modular_mattock",
10+
"miapi:modular_scythe",
11+
"miapi:modular_sickle"
12+
]
13+
}

‎common/src/main/resources/data/minecraft/tags/items/armor.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_helmet",
5+
"miapi:modular_chestplate",
6+
"miapi:modular_elytra",
7+
"miapi:modular_leggings",
8+
"miapi:modular_boots"
9+
]
10+
}

‎common/src/main/resources/data/minecraft/tags/items/axes.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_axe",
5+
"miapi:modular_mattock"
6+
]
7+
}

‎common/src/main/resources/data/minecraft/tags/items/boots.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_boots"
5+
]
6+
}

‎common/src/main/resources/data/minecraft/tags/items/bows.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_bow",
5+
"miapi:modular_small_bow",
6+
"miapi:modular_large_bow"
7+
]
8+
}

‎common/src/main/resources/data/minecraft/tags/items/chestplates.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_chestplate",
5+
"miapi:modular_elytra"
6+
]
7+
}

‎common/src/main/resources/data/minecraft/tags/items/crossbows.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_crossbow",
5+
"miapi:modular_small_crossbow",
6+
"miapi:modular_large_crossbow"
7+
]
8+
}

‎common/src/main/resources/data/minecraft/tags/items/helmets.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_helmet"
5+
]
6+
}

‎common/src/main/resources/data/minecraft/tags/items/hoes.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_hoe",
5+
"miapi:modular_scythe",
6+
"miapi:modular_sickle"
7+
]
8+
}

‎common/src/main/resources/data/minecraft/tags/items/knifes.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_dagger",
5+
"miapi:modular_throwing_knife"
6+
]
7+
}

‎common/src/main/resources/data/minecraft/tags/items/leggings.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_leggings"
5+
]
6+
}

‎common/src/main/resources/data/minecraft/tags/items/pickaxes.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_pickaxe",
5+
"miapi:modular_hammer",
6+
"miapi:modular_mattock"
7+
]
8+
}

‎common/src/main/resources/data/minecraft/tags/items/shovels.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_shovel"
5+
]
6+
}

‎common/src/main/resources/data/minecraft/tags/items/swords.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_handle",
5+
"miapi:modular_sword",
6+
"miapi:modular_katana",
7+
"miapi:modular_naginata",
8+
"miapi:modular_greatsword",
9+
"miapi:modular_dagger",
10+
"miapi:modular_spear",
11+
"miapi:modular_throwing_knife",
12+
"miapi:modular_rapier",
13+
"miapi:modular_longsword",
14+
"miapi:modular_trident",
15+
"miapi:modular_scythe",
16+
"miapi:modular_sickle"
17+
]
18+
}

‎common/src/main/resources/data/minecraft/tags/items/tools.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"miapi:modular_shovel",
5+
"miapi:modular_pickaxe",
6+
"miapi:modular_hammer",
7+
"miapi:modular_axe",
8+
"miapi:modular_hoe",
9+
"miapi:modular_mattock",
10+
"miapi:modular_scythe",
11+
"miapi:modular_sickle"
12+
]
13+
}

‎forge/src/main/java/smartin/miapi/forge/TrulyModularForge.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@
2222
import smartin.miapi.config.MiapiConfig;
2323
import smartin.miapi.datapack.MiapiReloadListener;
2424
import smartin.miapi.datapack.ReloadEvents;
25-
import smartin.miapi.forge.compat.epic_fight.EpicFightCompatProperty;
2625
import smartin.miapi.modules.properties.AttributeProperty;
2726
import smartin.miapi.modules.properties.compat.ht_treechop.TreechopUtil;
28-
import smartin.miapi.registries.RegistryInventory;
2927

3028
import java.util.LinkedHashMap;
3129
import java.util.List;
@@ -48,8 +46,8 @@ public TrulyModularForge() {
4846
//MinecraftForge.EVENT_BUS.register(new ServerEvents());
4947
Miapi.init();
5048

51-
if (Platform.isModLoaded("epicfight"))
52-
RegistryInventory.moduleProperties.register(EpicFightCompatProperty.KEY, new EpicFightCompatProperty());
49+
//if (Platform.isModLoaded("epicfight"))
50+
//RegistryInventory.moduleProperties.register(EpicFightCompatProperty.KEY, new EpicFightCompatProperty());
5351

5452

5553
LifecycleEvent.SERVER_STARTING.register((instance -> setupAttributes()));

‎forge/src/main/java/smartin/miapi/forge/mixin/ItemCapabilityProviderMixin.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@
22

33
import net.minecraft.item.ItemStack;
44
import org.spongepowered.asm.mixin.Mixin;
5-
import org.spongepowered.asm.mixin.Shadow;
65
import org.spongepowered.asm.mixin.injection.At;
76
import org.spongepowered.asm.mixin.injection.Inject;
87
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
9-
import smartin.miapi.forge.compat.epic_fight.EpicFightCompatProperty;
10-
import smartin.miapi.item.modular.ModularItem;
11-
import yesman.epicfight.world.capabilities.item.CapabilityItem;
128
import yesman.epicfight.world.capabilities.provider.ItemCapabilityProvider;
139

1410
@Mixin(ItemCapabilityProvider.class)
1511
public class ItemCapabilityProviderMixin {
16-
@Shadow
17-
private CapabilityItem capability;
12+
//@Shadow
13+
//private CapabilityItem capability;
1814

1915
@Inject(
2016
at = @At("TAIL"),
@@ -23,9 +19,9 @@ public class ItemCapabilityProviderMixin {
2319
require = -1
2420
)
2521
public void miapi$injectConfiguration(ItemStack itemstack, CallbackInfo ci) {
26-
if (itemstack.getItem() instanceof ModularItem) {
27-
CapabilityItem capabilityItem = EpicFightCompatProperty.get(itemstack);
28-
if (capabilityItem != null) capability = capabilityItem;
29-
}
22+
//if (itemstack.getItem() instanceof ModularItem) {
23+
//CapabilityItem capabilityItem = EpicFightCompatProperty.get(itemstack);
24+
//if (capabilityItem != null) capability = capabilityItem;
25+
//}
3026
}
3127
}

‎forge/src/main/resources/miapi.mixins.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"mixins": [
77
"ItemAttributeModifierEventAccessor",
88
"ItemAttributeModifierEventMixin",
9-
"ItemCapabilityProviderMixin",
109
"ItemStackMixinHighPriority"
1110
],
1211
"client": [

0 commit comments

Comments
 (0)