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

Disc rename, drink fix

Browse source
This commit is contained in:
paulevsGitch 2021-06-17 21:21:05 +03:00
parent c39d11e3dd
commit 52750fdffa
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -8,7 +8,7 @@ yarn_mappings=6
loader_version=0.11.3 loader_version=0.11.3
# Mod Properties # Mod Properties
mod_version = 0.1.34 mod_version = 0.1.35
maven_group = ru.bclib maven_group = ru.bclib
archives_base_name = bclib archives_base_name = bclib

4
src/main/java/ru/bclib/items/EndDiscItem.java → src/main/java/ru/bclib/items/BaseDiscItem.java
View file

@ -4,8 +4,8 @@ import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.RecordItem; import net.minecraft.world.item.RecordItem;
import ru.bclib.client.models.ItemModelProvider; import ru.bclib.client.models.ItemModelProvider;
public class EndDiscItem extends RecordItem implements ItemModelProvider { public class BaseDiscItem extends RecordItem implements ItemModelProvider {
public EndDiscItem(int comparatorOutput, SoundEvent sound, Properties settings) { public BaseDiscItem(int comparatorOutput, SoundEvent sound, Properties settings) {
super(comparatorOutput, sound, settings); super(comparatorOutput, sound, settings);
} }
} }

10
src/main/java/ru/bclib/items/BaseDrinkItem.java
View file

@ -34,7 +34,13 @@ public class BaseDrinkItem extends ModelProviderItem {
} }
@Override @Override
public ItemStack finishUsingItem(ItemStack stack, Level world, LivingEntity user) { public ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity user) {
if (this.isEdible()) {
int count = stack.getCount();
user.eat(level, stack);
stack.setCount(count);
}
if (user instanceof ServerPlayer) { if (user instanceof ServerPlayer) {
ServerPlayer serverPlayerEntity = (ServerPlayer) user; ServerPlayer serverPlayerEntity = (ServerPlayer) user;
CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayerEntity, stack); CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayerEntity, stack);
@ -45,7 +51,7 @@ public class BaseDrinkItem extends ModelProviderItem {
stack.shrink(1); stack.shrink(1);
} }
if (!world.isClientSide) { if (!level.isClientSide) {
user.removeAllEffects(); user.removeAllEffects();
} }

4
src/main/java/ru/bclib/registry/ItemsRegistry.java
View file

@ -21,7 +21,7 @@ import net.minecraft.world.item.TieredItem;
import net.minecraft.world.level.block.DispenserBlock; import net.minecraft.world.level.block.DispenserBlock;
import ru.bclib.items.BaseDrinkItem; import ru.bclib.items.BaseDrinkItem;
import ru.bclib.items.BaseSpawnEggItem; import ru.bclib.items.BaseSpawnEggItem;
import ru.bclib.items.EndDiscItem; import ru.bclib.items.BaseDiscItem;
import ru.bclib.items.ModelProviderItem; import ru.bclib.items.ModelProviderItem;
import ru.bclib.items.tool.BaseAxeItem; import ru.bclib.items.tool.BaseAxeItem;
import ru.bclib.items.tool.BaseHoeItem; import ru.bclib.items.tool.BaseHoeItem;
@ -35,7 +35,7 @@ public abstract class ItemsRegistry extends BaseRegistry<Item> {
} }
public Item registerDisc(String name, int power, SoundEvent sound) { public Item registerDisc(String name, int power, SoundEvent sound) {
return register(name, new EndDiscItem(power, sound, makeItemSettings().stacksTo(1))); return register(name, new BaseDiscItem(power, sound, makeItemSettings().stacksTo(1)));
} }
public Item registerItem(String name) { public Item registerItem(String name) {