Bump version
This commit is contained in:
parent
2625c7cbab
commit
d5b1415dbe
5 changed files with 20 additions and 13 deletions
|
@ -48,7 +48,7 @@ mod_name=Thresholds
|
||||||
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
|
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
|
||||||
mod_license=GPLv3
|
mod_license=GPLv3
|
||||||
# The mod version. See https://semver.org/
|
# The mod version. See https://semver.org/
|
||||||
mod_version=1201.4.022124.1732
|
mod_version=1201.4.022124.1921
|
||||||
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
|
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
|
||||||
# This should match the base package used for the mod sources.
|
# This should match the base package used for the mod sources.
|
||||||
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
|
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||||
|
|
|
@ -2,22 +2,28 @@ package dev.zontreck.otemod.entities;
|
||||||
|
|
||||||
import dev.zontreck.otemod.OTEMod;
|
import dev.zontreck.otemod.OTEMod;
|
||||||
import dev.zontreck.otemod.entities.monsters.PossumEntity;
|
import dev.zontreck.otemod.entities.monsters.PossumEntity;
|
||||||
|
import dev.zontreck.otemod.items.ThrownMobCaptureBall;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.entity.Entity;
|
||||||
import net.minecraft.world.entity.EntityType;
|
import net.minecraft.world.entity.EntityType;
|
||||||
import net.minecraft.world.entity.MobCategory;
|
import net.minecraft.world.entity.MobCategory;
|
||||||
|
import net.minecraft.world.entity.projectile.Snowball;
|
||||||
|
import net.minecraft.world.entity.projectile.ThrowableItemProjectile;
|
||||||
import net.minecraftforge.eventbus.api.IEventBus;
|
import net.minecraftforge.eventbus.api.IEventBus;
|
||||||
import net.minecraftforge.registries.DeferredRegister;
|
import net.minecraftforge.registries.DeferredRegister;
|
||||||
import net.minecraftforge.registries.ForgeRegistries;
|
import net.minecraftforge.registries.ForgeRegistries;
|
||||||
import net.minecraftforge.registries.RegistryObject;
|
import net.minecraftforge.registries.RegistryObject;
|
||||||
|
|
||||||
public class ModEntityTypes {
|
public class ModEntityTypes {
|
||||||
//public static final DeferredRegister<EntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, OTEMod.MOD_ID);
|
public static final DeferredRegister<EntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, OTEMod.MOD_ID);
|
||||||
|
|
||||||
//public static final RegistryObject<EntityType<? extends PossumEntity>> POSSUM = ENTITIES.register("possum", ()-> EntityType.Builder.of(PossumEntity::new, MobCategory.CREATURE).sized(1.5f, 0.5f).build(new ResourceLocation(OTEMod.MOD_ID, "possum").toString()));
|
//public static final RegistryObject<EntityType<? extends PossumEntity>> POSSUM = ENTITIES.register("possum", ()-> EntityType.Builder.of(PossumEntity::new, MobCategory.CREATURE).sized(1.5f, 0.5f).build(new ResourceLocation(OTEMod.MOD_ID, "possum").toString()));
|
||||||
|
|
||||||
|
|
||||||
|
private static EntityType registerEntity(EntityType.Builder builder, String entityName) {
|
||||||
|
return builder.build(entityName);
|
||||||
|
}
|
||||||
public static void register(IEventBus bus){
|
public static void register(IEventBus bus){
|
||||||
//ENTITIES.register(bus);
|
ENTITIES.register(bus);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,7 +37,12 @@ public class MobCaptureBall extends Item
|
||||||
ItemStack single = stack.copy();
|
ItemStack single = stack.copy();
|
||||||
single.setCount(1);
|
single.setCount(1);
|
||||||
|
|
||||||
//stack.shrink(1);
|
if(!pPlayer.getAbilities().instabuild)
|
||||||
|
{
|
||||||
|
stack.shrink(1);
|
||||||
|
}else {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
ThrownMobCaptureBall TPB = new ThrownMobCaptureBall(pLevel, pPlayer, single);
|
ThrownMobCaptureBall TPB = new ThrownMobCaptureBall(pLevel, pPlayer, single);
|
||||||
|
|
||||||
|
@ -47,12 +52,6 @@ public class MobCaptureBall extends Item
|
||||||
}
|
}
|
||||||
|
|
||||||
pPlayer.awardStat(Stats.ITEM_USED.get(this));
|
pPlayer.awardStat(Stats.ITEM_USED.get(this));
|
||||||
if(!pPlayer.getAbilities().instabuild)
|
|
||||||
{
|
|
||||||
stack.shrink(1);
|
|
||||||
}else {
|
|
||||||
|
|
||||||
}
|
|
||||||
return super.use(pLevel, pPlayer, pUsedHand);
|
return super.use(pLevel, pPlayer, pUsedHand);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,8 @@ import dev.zontreck.libzontreck.chat.ChatColor;
|
||||||
import dev.zontreck.libzontreck.lore.LoreContainer;
|
import dev.zontreck.libzontreck.lore.LoreContainer;
|
||||||
import dev.zontreck.libzontreck.lore.LoreEntry;
|
import dev.zontreck.libzontreck.lore.LoreEntry;
|
||||||
import dev.zontreck.libzontreck.util.ServerUtilities;
|
import dev.zontreck.libzontreck.util.ServerUtilities;
|
||||||
|
import dev.zontreck.otemod.blocks.entity.ModEntities;
|
||||||
|
import dev.zontreck.otemod.entities.ModEntityTypes;
|
||||||
import net.minecraft.core.particles.ItemParticleOption;
|
import net.minecraft.core.particles.ItemParticleOption;
|
||||||
import net.minecraft.core.particles.ParticleTypes;
|
import net.minecraft.core.particles.ParticleTypes;
|
||||||
import net.minecraft.nbt.CompoundTag;
|
import net.minecraft.nbt.CompoundTag;
|
||||||
|
@ -28,13 +30,13 @@ public class ThrownMobCaptureBall extends ThrowableItemProjectile
|
||||||
LivingEntity shooter;
|
LivingEntity shooter;
|
||||||
ItemStack self;
|
ItemStack self;
|
||||||
|
|
||||||
public ThrownMobCaptureBall(EntityType<? extends ThrownMobCaptureBall> entity, Level level)
|
public ThrownMobCaptureBall(EntityType entity, Level level)
|
||||||
{
|
{
|
||||||
super(entity, level);
|
super(entity, level);
|
||||||
}
|
}
|
||||||
public ThrownMobCaptureBall(Level level, LivingEntity shooter, ItemStack item)
|
public ThrownMobCaptureBall(Level level, LivingEntity shooter, ItemStack item)
|
||||||
{
|
{
|
||||||
super(EntityType.SNOWBALL, shooter, level);
|
super(EntityType.EGG, shooter, level);
|
||||||
|
|
||||||
this.shooter = shooter;
|
this.shooter = shooter;
|
||||||
if(item.getTag() == null)
|
if(item.getTag() == null)
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 289 B |
Reference in a new issue