-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Beta 32 - Tiered Shields and a bunch of content stuff
- Loading branch information
1 parent
98ad89b
commit 7d5cc09
Showing
70 changed files
with
1,661 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package net.atlas.combatify.extensions; | ||
|
|
||
| import net.minecraft.world.item.Tier; | ||
|
|
||
| public interface Tierable { | ||
| Tier getTier(); | ||
| } |
95 changes: 95 additions & 0 deletions
95
src/main/java/net/atlas/combatify/item/TieredShieldItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| package net.atlas.combatify.item; | ||
|
|
||
| import net.atlas.combatify.Combatify; | ||
| import net.atlas.combatify.config.ConfigurableItemData; | ||
| import net.atlas.combatify.config.ConfigurableWeaponData; | ||
| import net.atlas.combatify.extensions.ItemExtensions; | ||
| import net.atlas.combatify.extensions.LivingEntityExtensions; | ||
| import net.atlas.combatify.extensions.Tierable; | ||
| import net.atlas.combatify.util.BlockingType; | ||
| import net.fabricmc.api.EnvType; | ||
| import net.fabricmc.loader.api.FabricLoader; | ||
| import net.minecraft.client.renderer.item.ItemProperties; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.world.item.*; | ||
|
|
||
| import static net.atlas.combatify.Combatify.id; | ||
| import static net.atlas.combatify.Combatify.shields; | ||
| import static net.atlas.combatify.item.ItemRegistry.registerItem; | ||
|
|
||
| public class TieredShieldItem extends ShieldItem implements Tierable, ItemExtensions { | ||
| public final Tier tier; | ||
| public static final Item WOODEN_SHIELD = registerItem(id("wooden_shield"), new TieredShieldItem(Tiers.WOOD, new Item.Properties().durability(Tiers.WOOD.getUses() * 6))); | ||
| public static final Item IRON_SHIELD = registerItem(id("iron_shield"), new TieredShieldItem(Tiers.IRON, new Item.Properties().durability(Tiers.IRON.getUses() * 6))); | ||
| public static final Item GOLD_SHIELD = registerItem(id("golden_shield"), new TieredShieldItem(Tiers.GOLD, new Item.Properties().durability(Tiers.GOLD.getUses() * 6))); | ||
| public static final Item DIAMOND_SHIELD = registerItem(id("diamond_shield"), new TieredShieldItem(Tiers.DIAMOND, new Item.Properties().durability(Tiers.DIAMOND.getUses() * 6))); | ||
| public static final Item NETHERITE_SHIELD = registerItem(id("netherite_shield"), new TieredShieldItem(Tiers.NETHERITE, new Item.Properties().durability(Tiers.NETHERITE.getUses() * 6).fireResistant())); | ||
|
|
||
| public TieredShieldItem(Tier tier, Properties properties) { | ||
| super(properties); | ||
| this.tier = tier; | ||
| shields.add(this); | ||
| if(FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) | ||
| registerModelPredicate(); | ||
| } | ||
|
|
||
| private void registerModelPredicate() { | ||
| ItemProperties.register(this, new ResourceLocation("blocking"), (itemStack, clientWorld, livingEntity, i) -> | ||
| livingEntity != null && livingEntity.isUsingItem() && ((LivingEntityExtensions)livingEntity).getBlockingItem() == itemStack ? 1.0F : 0.0F); | ||
| } | ||
|
|
||
|
|
||
| public int getEnchantmentValue() { | ||
| return this.tier.getEnchantmentValue(); | ||
| } | ||
|
|
||
| public boolean isValidRepairItem(ItemStack itemStack, ItemStack itemStack2) { | ||
| return this.tier.getRepairIngredient().test(itemStack2); | ||
| } | ||
|
|
||
| @Override | ||
| public Tier getTier() { | ||
| return tier; | ||
| } | ||
| public static void init() { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void setStackSize(int stackSize) { | ||
| this.maxStackSize = stackSize; | ||
| } | ||
|
|
||
| @Override | ||
| public double getChargedAttackBonus() { | ||
| Item item = this; | ||
| double chargedBonus = 1.0; | ||
| if(Combatify.ITEMS.configuredItems.containsKey(item)) { | ||
| ConfigurableItemData configurableItemData = Combatify.ITEMS.configuredItems.get(item); | ||
| if (configurableItemData.type != null) | ||
| if (Combatify.ITEMS.configuredWeapons.containsKey(configurableItemData.type)) | ||
| if (Combatify.ITEMS.configuredWeapons.get(configurableItemData.type).chargedReach != null) | ||
| chargedBonus = Combatify.ITEMS.configuredWeapons.get(configurableItemData.type).chargedReach; | ||
| if (configurableItemData.chargedReach != null) | ||
| chargedBonus = configurableItemData.chargedReach; | ||
| } | ||
| return chargedBonus; | ||
| } | ||
|
|
||
| @Override | ||
| public BlockingType getBlockingType() { | ||
| if(Combatify.ITEMS != null && Combatify.ITEMS.configuredItems.containsKey(this)) { | ||
| ConfigurableItemData configurableItemData = Combatify.ITEMS.configuredItems.get(this); | ||
| if (configurableItemData.blockingType != null) { | ||
| return configurableItemData.blockingType; | ||
| } | ||
| if (configurableItemData.type != null && Combatify.ITEMS.configuredWeapons.containsKey(configurableItemData.type)) { | ||
| ConfigurableWeaponData configurableWeaponData = Combatify.ITEMS.configuredWeapons.get(configurableItemData.type); | ||
| if (configurableWeaponData.blockingType != null) { | ||
| return configurableWeaponData.blockingType; | ||
| } | ||
| } | ||
| } | ||
| return Combatify.registeredTypes.get(new ResourceLocation("new_shield")); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
src/main/java/net/atlas/combatify/mixin/PiglinAiMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package net.atlas.combatify.mixin; | ||
|
|
||
| import com.llamalad7.mixinextras.injector.ModifyReturnValue; | ||
| import com.llamalad7.mixinextras.sugar.Local; | ||
| import net.atlas.combatify.item.TieredShieldItem; | ||
| import net.minecraft.world.entity.LivingEntity; | ||
| import net.minecraft.world.entity.monster.piglin.PiglinAi; | ||
| import net.minecraft.world.item.*; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
|
|
||
| @SuppressWarnings("unused") | ||
| @Mixin(PiglinAi.class) | ||
| public class PiglinAiMixin { | ||
| @ModifyReturnValue(method = "isWearingGold", at = @At(value = "RETURN")) | ||
| private static boolean includeHoldingShield(boolean original, @Local(ordinal = 0) LivingEntity livingEntity) { | ||
| boolean bl = false; | ||
| Iterable<ItemStack> iterable = livingEntity.getHandSlots(); | ||
|
|
||
| for (ItemStack itemStack : iterable) { | ||
| Item item = itemStack.getItem(); | ||
| if(item instanceof TieredShieldItem tieredShield && tieredShield.getTier() == Tiers.GOLD) { | ||
| bl = true; | ||
| } | ||
| } | ||
|
|
||
| return original || bl; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.