MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reformated

Browse source
This commit is contained in:
Frank 2022-06-08 20:57:21 +02:00
parent 079b51e3f6
commit 852e5a6abc
385 changed files with 6924 additions and 5656 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/org/betterx/bclib/items/BaseAnvilItem.java
View file

@ -1,5 +1,9 @@
package org.betterx.bclib.items;
import org.betterx.bclib.blocks.BaseAnvilBlock;
import org.betterx.bclib.interfaces.BlockModelProvider;
import org.betterx.bclib.interfaces.ItemModelProvider;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.core.Registry;
import net.minecraft.network.chat.Component;
@ -16,10 +20,6 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.betterx.bclib.blocks.BaseAnvilBlock;
import org.betterx.bclib.interfaces.BlockModelProvider;
import org.betterx.bclib.interfaces.ItemModelProvider;
import java.util.List;
import java.util.Locale;
import org.jetbrains.annotations.Nullable;
@ -53,10 +53,12 @@ public class BaseAnvilItem extends BlockItem implements ItemModelProvider {
@Override
@Environment(EnvType.CLIENT)
public void appendHoverText(ItemStack itemStack,
@Nullable Level level,
List<Component> list,
TooltipFlag tooltipFlag) {
public void appendHoverText(
ItemStack itemStack,
@Nullable Level level,
List<Component> list,
TooltipFlag tooltipFlag
) {
int destruction = itemStack.getOrCreateTag().getInt(DESTRUCTION);
if (destruction > 0) {
BaseAnvilBlock block = (BaseAnvilBlock) ((BaseAnvilItem) itemStack.getItem()).getBlock();

18
src/main/java/org/betterx/bclib/items/BaseArmorItem.java
View file

@ -1,5 +1,7 @@
package org.betterx.bclib.items;
import org.betterx.bclib.interfaces.ItemModelProvider;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.ai.attributes.Attribute;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
@ -9,7 +11,6 @@ import net.minecraft.world.item.ArmorMaterial;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import org.betterx.bclib.interfaces.ItemModelProvider;
import java.util.UUID;
@ -31,20 +32,21 @@ public class BaseArmorItem extends ArmorItem implements ItemModelProvider {
addAttributeModifier(
Attributes.ARMOR,
new AttributeModifier(uuid, "Armor modifier", getDefense(), AttributeModifier.Operation.ADDITION)
);
);
addAttributeModifier(
Attributes.ARMOR_TOUGHNESS,
new AttributeModifier(uuid, "Armor toughness", getToughness(), AttributeModifier.Operation.ADDITION)
);
);
if (knockbackResistance > 0.0F) {
addAttributeModifier(
Attributes.KNOCKBACK_RESISTANCE,
new AttributeModifier(uuid,
"Armor knockback resistance",
knockbackResistance,
AttributeModifier.Operation.ADDITION
new AttributeModifier(
uuid,
"Armor knockback resistance",
knockbackResistance,
AttributeModifier.Operation.ADDITION
)
);
);
}
}

4
src/main/java/org/betterx/bclib/items/BaseBucketItem.java
View file

@ -1,5 +1,7 @@
package org.betterx.bclib.items;
import org.betterx.bclib.interfaces.ItemModelProvider;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.item.MobBucketItem;
@ -7,8 +9,6 @@ import net.minecraft.world.level.material.Fluids;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import org.betterx.bclib.interfaces.ItemModelProvider;
public class BaseBucketItem extends MobBucketItem implements ItemModelProvider {
public BaseBucketItem(EntityType<?> type, FabricItemSettings settings) {
super(type, Fluids.WATER, SoundEvents.BUCKET_EMPTY_FISH, settings.stacksTo(1));

4
src/main/java/org/betterx/bclib/items/BaseDiscItem.java
View file

@ -1,10 +1,10 @@
package org.betterx.bclib.items;
import org.betterx.bclib.interfaces.ItemModelProvider;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.RecordItem;
import org.betterx.bclib.interfaces.ItemModelProvider;
public class BaseDiscItem extends RecordItem implements ItemModelProvider {
public BaseDiscItem(int comparatorOutput, SoundEvent sound, Properties settings) {
super(comparatorOutput, sound, settings);

10
src/main/java/org/betterx/bclib/items/BaseSpawnEggItem.java
View file

@ -1,5 +1,10 @@
package org.betterx.bclib.items;
import org.betterx.bclib.client.models.BasePatterns;
import org.betterx.bclib.client.models.ModelsHelper;
import org.betterx.bclib.client.models.PatternsHelper;
import org.betterx.bclib.interfaces.ItemModelProvider;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EntityType;
@ -9,11 +14,6 @@ import net.minecraft.world.item.SpawnEggItem;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.betterx.bclib.client.models.BasePatterns;
import org.betterx.bclib.client.models.ModelsHelper;
import org.betterx.bclib.client.models.PatternsHelper;
import org.betterx.bclib.interfaces.ItemModelProvider;
import java.util.Optional;
public class BaseSpawnEggItem extends SpawnEggItem implements ItemModelProvider {

6
src/main/java/org/betterx/bclib/items/ModelProviderItem.java
View file

@ -1,5 +1,8 @@
package org.betterx.bclib.items;
import org.betterx.bclib.client.models.ModelsHelper;
import org.betterx.bclib.interfaces.ItemModelProvider;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
@ -7,9 +10,6 @@ import net.minecraft.world.item.Item;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.betterx.bclib.client.models.ModelsHelper;
import org.betterx.bclib.interfaces.ItemModelProvider;
public class ModelProviderItem extends Item implements ItemModelProvider {
public ModelProviderItem(Properties settings) {
super(settings);

6
src/main/java/org/betterx/bclib/items/tool/BaseAxeItem.java
View file

@ -1,5 +1,8 @@
package org.betterx.bclib.items.tool;
import org.betterx.bclib.client.models.ModelsHelper;
import org.betterx.bclib.interfaces.ItemModelProvider;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.AxeItem;
@ -8,9 +11,6 @@ import net.minecraft.world.item.Tier;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.betterx.bclib.client.models.ModelsHelper;
import org.betterx.bclib.interfaces.ItemModelProvider;
public class BaseAxeItem extends AxeItem implements ItemModelProvider {
public BaseAxeItem(Tier material, float attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);

6
src/main/java/org/betterx/bclib/items/tool/BaseHoeItem.java
View file

@ -1,5 +1,8 @@
package org.betterx.bclib.items.tool;
import org.betterx.bclib.client.models.ModelsHelper;
import org.betterx.bclib.interfaces.ItemModelProvider;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.HoeItem;
@ -8,9 +11,6 @@ import net.minecraft.world.item.Tier;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.betterx.bclib.client.models.ModelsHelper;
import org.betterx.bclib.interfaces.ItemModelProvider;
public class BaseHoeItem extends HoeItem implements ItemModelProvider {
public BaseHoeItem(Tier material, int attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);

6
src/main/java/org/betterx/bclib/items/tool/BasePickaxeItem.java
View file

@ -1,5 +1,8 @@
package org.betterx.bclib.items.tool;
import org.betterx.bclib.client.models.ModelsHelper;
import org.betterx.bclib.interfaces.ItemModelProvider;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.PickaxeItem;
@ -8,9 +11,6 @@ import net.minecraft.world.item.Tier;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.betterx.bclib.client.models.ModelsHelper;
import org.betterx.bclib.interfaces.ItemModelProvider;
public class BasePickaxeItem extends PickaxeItem implements ItemModelProvider {
public BasePickaxeItem(Tier material, int attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);

12
src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java
View file

@ -1,6 +1,9 @@
package org.betterx.bclib.items.tool;
import org.betterx.bclib.api.v2.tag.CommonItemTags;
import org.betterx.bclib.api.v2.tag.TagAPI;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
@ -8,17 +11,16 @@ import net.minecraft.world.item.ShearsItem;
import net.fabricmc.fabric.api.mininglevel.v1.FabricMineableTags;
import org.betterx.bclib.api.v2.tag.CommonItemTags;
import org.betterx.bclib.api.v2.tag.TagAPI;
public class BaseShearsItem extends ShearsItem {
public BaseShearsItem(Properties properties) {
super(properties);
}
public static boolean isShear(ItemStack tool) {
return tool.is(Items.SHEARS) | tool.is(CommonItemTags.SHEARS) || TagAPI.isToolWithMineableTag(tool,
FabricMineableTags.SHEARS_MINEABLE);
return tool.is(Items.SHEARS) | tool.is(CommonItemTags.SHEARS) || TagAPI.isToolWithMineableTag(
tool,
FabricMineableTags.SHEARS_MINEABLE
);
}
public static boolean isShear(ItemStack itemStack, Item item) {

6
src/main/java/org/betterx/bclib/items/tool/BaseShovelItem.java
View file

@ -1,5 +1,8 @@
package org.betterx.bclib.items.tool;
import org.betterx.bclib.client.models.ModelsHelper;
import org.betterx.bclib.interfaces.ItemModelProvider;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ShovelItem;
@ -8,9 +11,6 @@ import net.minecraft.world.item.Tier;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.betterx.bclib.client.models.ModelsHelper;
import org.betterx.bclib.interfaces.ItemModelProvider;
public class BaseShovelItem extends ShovelItem implements ItemModelProvider {
public BaseShovelItem(Tier material, float attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);

6
src/main/java/org/betterx/bclib/items/tool/BaseSwordItem.java
View file

@ -1,5 +1,8 @@
package org.betterx.bclib.items.tool;
import org.betterx.bclib.client.models.ModelsHelper;
import org.betterx.bclib.interfaces.ItemModelProvider;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.SwordItem;
@ -8,9 +11,6 @@ import net.minecraft.world.item.Tier;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.betterx.bclib.client.models.ModelsHelper;
import org.betterx.bclib.interfaces.ItemModelProvider;
public class BaseSwordItem extends SwordItem implements ItemModelProvider {
public BaseSwordItem(Tier material, int attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);