Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-12-26 08:19:24 +01:00
Code Issues Projects Releases Wiki Activity

rename items to fit the style

Browse source
This commit is contained in:
Ellpeck 2020-01-26 01:41:49 +01:00
parent 5e8e434925
commit 7330809178
29 changed files with 104 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/de/ellpeck/naturesaura/compat/jei/JEINaturesAuraPlugin.java
View file

@ -4,8 +4,8 @@ import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.aura.container.IAuraContainer;
import de.ellpeck.naturesaura.blocks.ModBlocks;
import de.ellpeck.naturesaura.items.AuraBottle;
import de.ellpeck.naturesaura.items.EffectPowder;
import de.ellpeck.naturesaura.items.ItemAuraBottle;
import de.ellpeck.naturesaura.items.ItemEffectPowder;
import de.ellpeck.naturesaura.items.ModItems;
import mezz.jei.api.IModPlugin;
import mezz.jei.api.JeiPlugin;
@ -44,8 +44,8 @@ public class JEINaturesAuraPlugin implements IModPlugin {
@Override
public void registerItemSubtypes(ISubtypeRegistration registration) {
registration.registerSubtypeInterpreter(ModItems.EFFECT_POWDER, stack -> EffectPowder.getEffect(stack).toString());
registration.registerSubtypeInterpreter(ModItems.AURA_BOTTLE, stack -> AuraBottle.getType(stack).getName().toString());
registration.registerSubtypeInterpreter(ModItems.EFFECT_POWDER, stack -> ItemEffectPowder.getEffect(stack).toString());
registration.registerSubtypeInterpreter(ModItems.AURA_BOTTLE, stack -> ItemAuraBottle.getType(stack).getName().toString());
ISubtypeInterpreter auraInterpreter = stack -> {
IAuraContainer container = stack.getCapability(NaturesAuraAPI.capAuraContainer).orElse(null);

6
src/main/java/de/ellpeck/naturesaura/entities/EntityEffectInhibitor.java
View file

@ -5,7 +5,7 @@ import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.misc.IWorldData;
import de.ellpeck.naturesaura.api.render.IVisualizable;
import de.ellpeck.naturesaura.items.EffectPowder;
import de.ellpeck.naturesaura.items.ItemEffectPowder;
import de.ellpeck.naturesaura.items.ModItems;
import de.ellpeck.naturesaura.misc.WorldData;
import net.minecraft.entity.Entity;
@ -44,7 +44,7 @@ public class EntityEffectInhibitor extends Entity implements IVisualizable {
}
public static void place(World world, ItemStack stack, double posX, double posY, double posZ) {
ResourceLocation effect = EffectPowder.getEffect(stack);
ResourceLocation effect = ItemEffectPowder.getEffect(stack);
EntityEffectInhibitor entity = new EntityEffectInhibitor(ModEntities.EFFECT_INHIBITOR, world);
entity.setInhibitedEffect(effect);
entity.setColor(NaturesAuraAPI.EFFECT_POWDERS.get(effect));
@ -159,7 +159,7 @@ public class EntityEffectInhibitor extends Entity implements IVisualizable {
}
public ItemStack getDrop() {
return EffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, this.getAmount()), this.getInhibitedEffect());
return ItemEffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, this.getAmount()), this.getInhibitedEffect());
}
public void setInhibitedEffect(ResourceLocation effect) {

4
src/main/java/de/ellpeck/naturesaura/entities/render/RenderEffectInhibitor.java
View file

@ -3,7 +3,7 @@ package de.ellpeck.naturesaura.entities.render;
import com.mojang.blaze3d.platform.GlStateManager;
import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.entities.EntityEffectInhibitor;
import de.ellpeck.naturesaura.items.EffectPowder;
import de.ellpeck.naturesaura.items.ItemEffectPowder;
import de.ellpeck.naturesaura.items.ModItems;
import net.minecraft.client.renderer.entity.EntityRenderer;
import net.minecraft.client.renderer.entity.EntityRendererManager;
@ -42,7 +42,7 @@ public class RenderEffectInhibitor extends EntityRenderer<EntityEffectInhibitor>
GlStateManager.scalef(0.5F, 0.5F, 0.5F);
ResourceLocation effect = entity.getInhibitedEffect();
Helper.renderItemInWorld(this.items.computeIfAbsent(effect,
res -> EffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER), effect)));
res -> ItemEffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER), effect)));
GlStateManager.popMatrix();
}
}

14
src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java
View file

@ -14,9 +14,9 @@ import de.ellpeck.naturesaura.blocks.tiles.TileEntityNatureAltar;
import de.ellpeck.naturesaura.blocks.tiles.TileEntityRFConverter;
import de.ellpeck.naturesaura.compat.Compat;
import de.ellpeck.naturesaura.enchant.ModEnchantment;
import de.ellpeck.naturesaura.items.AuraCache;
import de.ellpeck.naturesaura.items.ItemAuraCache;
import de.ellpeck.naturesaura.items.ModItems;
import de.ellpeck.naturesaura.items.RangeVisualizer;
import de.ellpeck.naturesaura.items.ItemRangeVisualizer;
import de.ellpeck.naturesaura.packet.PacketAuraChunk;
import de.ellpeck.naturesaura.particles.ParticleHandler;
import net.minecraft.block.Block;
@ -138,7 +138,7 @@ public class ClientEvents {
Minecraft mc = Minecraft.getInstance();
if (mc.world == null) {
ParticleHandler.clearParticles();
RangeVisualizer.clear();
ItemRangeVisualizer.clear();
PENDING_AURA_CHUNKS.clear();
} else {
PENDING_AURA_CHUNKS.removeIf(next -> next.tryHandle(mc.world));
@ -182,7 +182,7 @@ public class ClientEvents {
NaturesAuraAPI.IInternalHooks inst = NaturesAuraAPI.instance();
inst.setParticleSpawnRange(512);
inst.setParticleDepth(false);
for (BlockPos pos : RangeVisualizer.VISUALIZED_RAILS.get(mc.world.getDimension().getType())) {
for (BlockPos pos : ItemRangeVisualizer.VISUALIZED_RAILS.get(mc.world.getDimension().getType())) {
NaturesAuraAPI.instance().spawnMagicParticle(
pos.getX() + mc.world.rand.nextFloat(),
pos.getY() + mc.world.rand.nextFloat(),
@ -214,7 +214,7 @@ public class ClientEvents {
for (int i = 0; i < mc.player.inventory.getSizeInventory(); i++) {
ItemStack slot = mc.player.inventory.getStackInSlot(i);
if (!slot.isEmpty()) {
if (slot.getItem() instanceof AuraCache)
if (slot.getItem() instanceof ItemAuraCache)
heldCache = slot;
else if (slot.getItem() == ModItems.EYE && i <= 8)
heldEye = slot;
@ -285,7 +285,7 @@ public class ClientEvents {
GL11.glDisable(GL11.GL_TEXTURE_2D);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBegin(GL11.GL_QUADS);
for (BlockPos pos : RangeVisualizer.VISUALIZED_BLOCKS.get(dim)) {
for (BlockPos pos : ItemRangeVisualizer.VISUALIZED_BLOCKS.get(dim)) {
if (!mc.world.isBlockLoaded(pos))
continue;
BlockState state = mc.world.getBlockState(pos);
@ -294,7 +294,7 @@ public class ClientEvents {
continue;
this.renderVisualize((IVisualizable) block, mc.world, pos);
}
for (Entity entity : RangeVisualizer.VISUALIZED_ENTITIES.get(dim)) {
for (Entity entity : ItemRangeVisualizer.VISUALIZED_ENTITIES.get(dim)) {
if (!entity.isAlive() || !(entity instanceof IVisualizable))
continue;
this.renderVisualize((IVisualizable) entity, mc.world, entity.getPosition());

8
src/main/java/de/ellpeck/naturesaura/items/AuraBottle.java → src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java
View file

@ -27,9 +27,9 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import static net.minecraft.dispenser.DefaultDispenseItemBehavior.doDispense;
public class AuraBottle extends ItemImpl implements IColorProvidingItem {
public class ItemAuraBottle extends ItemImpl implements IColorProvidingItem {
public AuraBottle(Item emptyBottle) {
public ItemAuraBottle(Item emptyBottle) {
super("aura_bottle", new Properties().group(NaturesAura.CREATIVE_TAB));
MinecraftForge.EVENT_BUS.register(new EventHandler());
@ -43,7 +43,7 @@ public class AuraBottle extends ItemImpl implements IColorProvidingItem {
ItemStack dispense = stack.split(1);
if (offsetState.getBlock().isAir(offsetState, world, offset)) {
if (IAuraChunk.getAuraInArea(world, offset, 30) >= 100000) {
dispense = setType(new ItemStack(AuraBottle.this), IAuraType.forWorld(world));
dispense = setType(new ItemStack(ItemAuraBottle.this), IAuraType.forWorld(world));
BlockPos spot = IAuraChunk.getHighestSpot(world, offset, 30, offset);
IAuraChunk.getAuraChunk(world, spot).drainAura(spot, 20000);
@ -110,7 +110,7 @@ public class AuraBottle extends ItemImpl implements IColorProvidingItem {
held.shrink(1);
player.inventory.addItemStackToInventory(
setType(new ItemStack(AuraBottle.this), IAuraType.forWorld(player.world)));
setType(new ItemStack(ItemAuraBottle.this), IAuraType.forWorld(player.world)));
BlockPos spot = IAuraChunk.getHighestSpot(player.world, pos, 30, pos);
IAuraChunk.getAuraChunk(player.world, spot).drainAura(spot, 20000);

6
src/main/java/de/ellpeck/naturesaura/items/AuraCache.java → src/main/java/de/ellpeck/naturesaura/items/ItemAuraCache.java
View file

@ -28,11 +28,11 @@ import net.minecraftforge.common.util.LazyOptional;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class AuraCache extends ItemImpl implements ITrinketItem {
public class ItemAuraCache extends ItemImpl implements ITrinketItem {
private final int capacity;
public AuraCache(String name, int capacity) {
public ItemAuraCache(String name, int capacity) {
super(name, new Properties().maxStackSize(1).group(NaturesAura.CREATIVE_TAB));
this.capacity = capacity;
}
@ -94,7 +94,7 @@ public class AuraCache extends ItemImpl implements ITrinketItem {
@Override
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable CompoundNBT nbt) {
return new ICapabilityProvider() {
private final ItemAuraContainer container = new ItemAuraContainer(stack, null, AuraCache.this.capacity);
private final ItemAuraContainer container = new ItemAuraContainer(stack, null, ItemAuraCache.this.capacity);
@Nonnull
@Override

4
src/main/java/de/ellpeck/naturesaura/items/BirthSpirit.java → src/main/java/de/ellpeck/naturesaura/items/ItemBirthSpirit.java
View file

@ -9,8 +9,8 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.BabyEntitySpawnEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
public class BirthSpirit extends Glowing {
public BirthSpirit() {
public class ItemBirthSpirit extends ItemGlowing {
public ItemBirthSpirit() {
super("birth_spirit");
MinecraftForge.EVENT_BUS.register(new EventHandler());
}

4
src/main/java/de/ellpeck/naturesaura/items/CaveFinder.java → src/main/java/de/ellpeck/naturesaura/items/ItemCaveFinder.java
View file

@ -14,8 +14,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.LightType;
import net.minecraft.world.World;
public class CaveFinder extends ItemImpl {
public CaveFinder() {
public class ItemCaveFinder extends ItemImpl {
public ItemCaveFinder() {
super("cave_finder", new Properties().maxStackSize(1).group(NaturesAura.CREATIVE_TAB));
}

4
src/main/java/de/ellpeck/naturesaura/items/ColorChanger.java → src/main/java/de/ellpeck/naturesaura/items/ItemColorChanger.java
View file

@ -16,9 +16,9 @@ import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
public class ColorChanger extends ItemImpl implements IColorProvidingItem {
public class ItemColorChanger extends ItemImpl implements IColorProvidingItem {
public ColorChanger() {
public ItemColorChanger() {
super("color_changer", new Properties().maxStackSize(1).group(NaturesAura.CREATIVE_TAB));
this.addPropertyOverride(new ResourceLocation(NaturesAura.MOD_ID, "fill_mode"),

4
src/main/java/de/ellpeck/naturesaura/items/EffectPowder.java → src/main/java/de/ellpeck/naturesaura/items/ItemEffectPowder.java
View file

@ -18,9 +18,9 @@ import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
public class EffectPowder extends ItemImpl implements IColorProvidingItem {
public class ItemEffectPowder extends ItemImpl implements IColorProvidingItem {
public EffectPowder() {
public ItemEffectPowder() {
super("effect_powder", new Properties().group(NaturesAura.CREATIVE_TAB));
}

4
src/main/java/de/ellpeck/naturesaura/items/EnderAccess.java → src/main/java/de/ellpeck/naturesaura/items/ItemEnderAccess.java
View file

@ -29,8 +29,8 @@ import net.minecraftforge.items.IItemHandler;
import javax.annotation.Nullable;
import java.util.List;
public class EnderAccess extends ItemImpl {
public EnderAccess() {
public class ItemEnderAccess extends ItemImpl {
public ItemEnderAccess() {
super("ender_access", new Properties().group(NaturesAura.CREATIVE_TAB));
}

4
src/main/java/de/ellpeck/naturesaura/items/Eye.java → src/main/java/de/ellpeck/naturesaura/items/ItemEye.java
View file

@ -10,9 +10,9 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
public class Eye extends ItemImpl implements ITrinketItem {
public class ItemEye extends ItemImpl implements ITrinketItem {
public Eye(String name) {
public ItemEye(String name) {
super(name, new Properties().maxStackSize(1).group(NaturesAura.CREATIVE_TAB));
}

4
src/main/java/de/ellpeck/naturesaura/items/Glowing.java → src/main/java/de/ellpeck/naturesaura/items/ItemGlowing.java
View file

@ -6,8 +6,8 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
// Name (Glowing) ambiguous?
public class Glowing extends ItemImpl {
public Glowing(String baseName) {
public class ItemGlowing extends ItemImpl {
public ItemGlowing(String baseName) {
super(baseName, new Properties().group(NaturesAura.CREATIVE_TAB));
}

4
src/main/java/de/ellpeck/naturesaura/items/GoldFiber.java → src/main/java/de/ellpeck/naturesaura/items/ItemGoldFiber.java
View file

@ -13,9 +13,9 @@ import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public class GoldFiber extends ItemImpl implements IColorProvidingItem {
public class ItemGoldFiber extends ItemImpl implements IColorProvidingItem {
public GoldFiber() {
public ItemGoldFiber() {
super("gold_fiber", new Properties().group(NaturesAura.CREATIVE_TAB));
}

4
src/main/java/de/ellpeck/naturesaura/items/MoverMinecart.java → src/main/java/de/ellpeck/naturesaura/items/ItemMoverMinecart.java
View file

@ -12,9 +12,9 @@ import net.minecraft.world.World;
import javax.annotation.Nonnull;
public class MoverMinecart extends ItemImpl {
public class ItemMoverMinecart extends ItemImpl {
public MoverMinecart() {
public ItemMoverMinecart() {
super("mover_cart", new Properties().maxStackSize(1).group(NaturesAura.CREATIVE_TAB));
}

4
src/main/java/de/ellpeck/naturesaura/items/MultiblockMaker.java → src/main/java/de/ellpeck/naturesaura/items/ItemMultiblockMaker.java
View file

@ -15,11 +15,11 @@ import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.List;
public class MultiblockMaker extends ItemImpl {
public class ItemMultiblockMaker extends ItemImpl {
private static List<IMultiblock> multiblocks;
public MultiblockMaker() {
public ItemMultiblockMaker() {
super("multiblock_maker", new Properties().group(NaturesAura.CREATIVE_TAB));
}

6
src/main/java/de/ellpeck/naturesaura/items/RangeVisualizer.java → src/main/java/de/ellpeck/naturesaura/items/ItemRangeVisualizer.java
View file

@ -21,13 +21,13 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
public class RangeVisualizer extends ItemImpl {
public class ItemRangeVisualizer extends ItemImpl {
public static final ListMultimap<DimensionType, BlockPos> VISUALIZED_BLOCKS = ArrayListMultimap.create();
public static final ListMultimap<DimensionType, Entity> VISUALIZED_ENTITIES = ArrayListMultimap.create();
public static final ListMultimap<DimensionType, BlockPos> VISUALIZED_RAILS = ArrayListMultimap.create();
public RangeVisualizer() {
public ItemRangeVisualizer() {
super("range_visualizer", new Properties().maxStackSize(1).group(NaturesAura.CREATIVE_TAB));
MinecraftForge.EVENT_BUS.register(new EventHandler());
}
@ -81,7 +81,7 @@ public class RangeVisualizer extends ItemImpl {
@SubscribeEvent
public void onInteract(PlayerInteractEvent.EntityInteractSpecific event) {
ItemStack stack = event.getItemStack();
if (stack.isEmpty() || stack.getItem() != RangeVisualizer.this)
if (stack.isEmpty() || stack.getItem() != ItemRangeVisualizer.this)
return;
Entity entity = event.getTarget();
if (entity instanceof IVisualizable) {

8
src/main/java/de/ellpeck/naturesaura/items/ShockwaveCreator.java → src/main/java/de/ellpeck/naturesaura/items/ItemShockwaveCreator.java
View file

@ -4,7 +4,7 @@ import com.mojang.blaze3d.platform.GlStateManager;
import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.render.ITrinketItem;
import de.ellpeck.naturesaura.items.tools.Armor;
import de.ellpeck.naturesaura.items.tools.ItemArmor;
import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles;
import net.minecraft.block.BlockState;
@ -32,11 +32,11 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import java.util.List;
public class ShockwaveCreator extends ItemImpl implements ITrinketItem {
public class ItemShockwaveCreator extends ItemImpl implements ITrinketItem {
private static final ResourceLocation RES_WORN = new ResourceLocation(NaturesAura.MOD_ID, "textures/items/shockwave_creator_player.png");
public ShockwaveCreator() {
public ItemShockwaveCreator() {
super("shockwave_creator", new Properties().maxStackSize(1).group(NaturesAura.CREATIVE_TAB));
}
@ -75,7 +75,7 @@ public class ShockwaveCreator extends ItemImpl implements ITrinketItem {
source = DamageSource.causePlayerDamage((PlayerEntity) living);
else
source = DamageSource.MAGIC;
boolean infusedSet = Armor.isFullSetEquipped(living, 0);
boolean infusedSet = ItemArmor.isFullSetEquipped(living, 0);
int range = 5;
List<LivingEntity> mobs = worldIn.getEntitiesWithinAABB(LivingEntity.class, new AxisAlignedBB(

4
src/main/java/de/ellpeck/naturesaura/items/tools/Armor.java → src/main/java/de/ellpeck/naturesaura/items/tools/ItemArmor.java
View file

@ -25,12 +25,12 @@ import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
public class Armor extends ArmorItem implements IModItem, IModelProvider {
public class ItemArmor extends ArmorItem implements IModItem, IModelProvider {
private static List<Item[]> sets;
private final String baseName;
public Armor(String baseName, IArmorMaterial materialIn, EquipmentSlotType equipmentSlotIn) {
public ItemArmor(String baseName, IArmorMaterial materialIn, EquipmentSlotType equipmentSlotIn) {
super(materialIn, equipmentSlotIn, new Properties().group(NaturesAura.CREATIVE_TAB));
this.baseName = baseName;
MinecraftForge.EVENT_BUS.register(new EventHandler());

4
src/main/java/de/ellpeck/naturesaura/items/tools/Axe.java → src/main/java/de/ellpeck/naturesaura/items/tools/ItemAxe.java
View file

@ -16,10 +16,10 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider;
import javax.annotation.Nullable;
public class Axe extends AxeItem implements IModItem, IModelProvider {
public class ItemAxe extends AxeItem implements IModItem, IModelProvider {
private final String baseName;
public Axe(String baseName, IItemTier material, float damage, float speed) {
public ItemAxe(String baseName, IItemTier material, float damage, float speed) {
super(material, damage, speed, new Properties().group(NaturesAura.CREATIVE_TAB));
this.baseName = baseName;
ModRegistry.add(this);

4
src/main/java/de/ellpeck/naturesaura/items/tools/Hoe.java → src/main/java/de/ellpeck/naturesaura/items/tools/ItemHoe.java
View file

@ -17,11 +17,11 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider;
import javax.annotation.Nullable;
import java.util.Random;
public class Hoe extends HoeItem implements IModItem, IModelProvider {
public class ItemHoe extends HoeItem implements IModItem, IModelProvider {
private final String baseName;
public Hoe(String baseName, IItemTier material, float speed) {
public ItemHoe(String baseName, IItemTier material, float speed) {
super(material, speed, new Properties().group(NaturesAura.CREATIVE_TAB));
this.baseName = baseName;
ModRegistry.add(this);

4
src/main/java/de/ellpeck/naturesaura/items/tools/Pickaxe.java → src/main/java/de/ellpeck/naturesaura/items/tools/ItemPickaxe.java
View file

@ -25,11 +25,11 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider;
import javax.annotation.Nullable;
public class Pickaxe extends PickaxeItem implements IModItem, IModelProvider {
public class ItemPickaxe extends PickaxeItem implements IModItem, IModelProvider {
private final String baseName;
public Pickaxe(String baseName, IItemTier material, int damage, float speed) {
public ItemPickaxe(String baseName, IItemTier material, int damage, float speed) {
super(material, damage, speed, new Properties().group(NaturesAura.CREATIVE_TAB));
this.baseName = baseName;
ModRegistry.add(this);

4
src/main/java/de/ellpeck/naturesaura/items/tools/Shovel.java → src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovel.java
View file

@ -25,10 +25,10 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider;
import javax.annotation.Nullable;
public class Shovel extends ShovelItem implements IModItem, IModelProvider {
public class ItemShovel extends ShovelItem implements IModItem, IModelProvider {
private final String baseName;
public Shovel(String baseName, IItemTier material, float damage, float speed) {
public ItemShovel(String baseName, IItemTier material, float damage, float speed) {
super(material, damage, speed, new Properties().group(NaturesAura.CREATIVE_TAB));
this.baseName = baseName;
ModRegistry.add(this);

4
src/main/java/de/ellpeck/naturesaura/items/tools/Sword.java → src/main/java/de/ellpeck/naturesaura/items/tools/ItemSword.java
View file

@ -17,10 +17,10 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider;
import javax.annotation.Nullable;
public class Sword extends SwordItem implements IModItem, IModelProvider {
public class ItemSword extends SwordItem implements IModItem, IModelProvider {
private final String baseName;
public Sword(String baseName, IItemTier material, int damage, float speed) {
public ItemSword(String baseName, IItemTier material, int damage, float speed) {
super(material, damage, speed, new Properties().group(NaturesAura.CREATIVE_TAB));
this.baseName = baseName;
ModRegistry.add(this);

4
src/main/java/de/ellpeck/naturesaura/packet/PacketClient.java
View file

@ -1,6 +1,6 @@
package de.ellpeck.naturesaura.packet;
import de.ellpeck.naturesaura.items.RangeVisualizer;
import de.ellpeck.naturesaura.items.ItemRangeVisualizer;
import net.minecraft.client.Minecraft;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.math.BlockPos;
@ -51,7 +51,7 @@ public class PacketClient {
case 0: // dimension rail visualization
int goalDim = message.data[0];
BlockPos goalPos = new BlockPos(message.data[1], message.data[2], message.data[3]);
RangeVisualizer.visualize(mc.player, RangeVisualizer.VISUALIZED_RAILS, DimensionType.getById(goalDim), goalPos);
ItemRangeVisualizer.visualize(mc.player, ItemRangeVisualizer.VISUALIZED_RAILS, DimensionType.getById(goalDim), goalPos);
}
}
}

22
src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java
View file

@ -11,8 +11,8 @@ import de.ellpeck.naturesaura.chunk.effect.AnimalEffect;
import de.ellpeck.naturesaura.chunk.effect.CacheRechargeEffect;
import de.ellpeck.naturesaura.chunk.effect.OreSpawnEffect;
import de.ellpeck.naturesaura.chunk.effect.PlantBoostEffect;
import de.ellpeck.naturesaura.items.AuraBottle;
import de.ellpeck.naturesaura.items.EffectPowder;
import de.ellpeck.naturesaura.items.ItemAuraBottle;
import de.ellpeck.naturesaura.items.ItemEffectPowder;
import de.ellpeck.naturesaura.items.ModItems;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
@ -96,35 +96,35 @@ public final class ModRecipes {
ing(ModItems.TOKEN_ANGER)).register();
new TreeRitualRecipe(res("plant_powder"),
ing(new ItemStack(Blocks.OAK_SAPLING)),
EffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 24), PlantBoostEffect.NAME), 400,
ItemEffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 24), PlantBoostEffect.NAME), 400,
ing(ModBlocks.GOLD_POWDER),
ing(ModBlocks.GOLD_POWDER),
ing(ModItems.SKY_INGOT),
ing(Items.WHEAT)).register();
new TreeRitualRecipe(res("cache_powder"),
ing(new ItemStack(Blocks.OAK_SAPLING)),
EffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 32), CacheRechargeEffect.NAME), 400,
ItemEffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 32), CacheRechargeEffect.NAME), 400,
ing(ModBlocks.GOLD_POWDER),
ing(ModBlocks.GOLD_POWDER),
ing(ModItems.SKY_INGOT),
ing(ModItems.AURA_CACHE)).register();
new TreeRitualRecipe(res("animal_powder"),
ing(Blocks.JUNGLE_SAPLING),
EffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 8), AnimalEffect.NAME), 400,
ItemEffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 8), AnimalEffect.NAME), 400,
ing(ModBlocks.GOLD_POWDER),
ing(ModBlocks.GOLD_POWDER),
ing(ModItems.SKY_INGOT),
ing(Items.EGG)).register();
new TreeRitualRecipe(res("ore_spawn_powder"),
ing(Blocks.OAK_SAPLING),
EffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 4), OreSpawnEffect.NAME), 400,
ItemEffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 4), OreSpawnEffect.NAME), 400,
ing(ModBlocks.GOLD_POWDER),
ing(ModBlocks.GOLD_POWDER),
ing(Blocks.DIAMOND_ORE),
ing(Blocks.REDSTONE_ORE)).register();
new TreeRitualRecipe(res("token_joy"),
ing(Blocks.OAK_SAPLING), new ItemStack(ModItems.TOKEN_JOY, 2), 200,
nbtIng(AuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_OVERWORLD)),
nbtIng(ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_OVERWORLD)),
ing(ModItems.GOLD_LEAF),
ing(ItemTags.SMALL_FLOWERS),
ing(Items.APPLE),
@ -132,7 +132,7 @@ public final class ModRecipes {
ing(Items.IRON_INGOT)).register();
new TreeRitualRecipe(res("token_anger"),
ing(Blocks.OAK_SAPLING), new ItemStack(ModItems.TOKEN_ANGER, 2), 200,
nbtIng(AuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_NETHER)),
nbtIng(ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_NETHER)),
ing(ModItems.GOLD_LEAF),
ing(Blocks.MAGMA_BLOCK),
ing(Items.BLAZE_POWDER),
@ -140,7 +140,7 @@ public final class ModRecipes {
ing(Items.ENDER_PEARL)).register();
new TreeRitualRecipe(res("token_sorrow"),
ing(Blocks.OAK_SAPLING), new ItemStack(ModItems.TOKEN_SORROW, 2), 200,
nbtIng(AuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_OVERWORLD)),
nbtIng(ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_OVERWORLD)),
ing(ModItems.GOLD_LEAF),
ing(Items.GHAST_TEAR),
ing(Items.BEEF, Items.MUTTON, Items.CHICKEN, Items.PORKCHOP),
@ -148,7 +148,7 @@ public final class ModRecipes {
ing(ItemTags.FISHES)).register();
new TreeRitualRecipe(res("token_fear"),
ing(Blocks.OAK_SAPLING), new ItemStack(ModItems.TOKEN_FEAR, 2), 200,
nbtIng(AuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_NETHER)),
nbtIng(ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_NETHER)),
ing(ModItems.GOLD_LEAF),
ing(Items.ROTTEN_FLESH),
ing(Items.FEATHER),
@ -166,7 +166,7 @@ public final class ModRecipes {
Ingredient.EMPTY, 7500, 40).register();
Ingredient conversion = ing(ModBlocks.CONVERSION_CATALYST);
new AltarRecipe(res("breath"), nbtIng(AuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_END)), new ItemStack(Items.DRAGON_BREATH), conversion, 20000, 80).register();
new AltarRecipe(res("breath"), nbtIng(ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_END)), new ItemStack(Items.DRAGON_BREATH), conversion, 20000, 80).register();
new AltarRecipe(res("leather"), ing(Items.ROTTEN_FLESH), new ItemStack(Items.LEATHER), conversion, 10000, 50).register();
new AltarRecipe(res("soul_sand"), ing(Blocks.SAND), new ItemStack(Blocks.SOUL_SAND), conversion, 5000, 100).register();
new AltarRecipe(res("nether_wart"), ing(Blocks.RED_MUSHROOM), new ItemStack(Items.NETHER_WART), conversion, 30000, 250).register();

4
src/main/java/de/ellpeck/naturesaura/reg/NAArmorMaterial.java → src/main/java/de/ellpeck/naturesaura/reg/ModArmorMaterial.java
View file

@ -13,7 +13,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import java.util.function.Supplier;
public enum NAArmorMaterial implements IArmorMaterial {
public enum ModArmorMaterial implements IArmorMaterial {
INFUSED(NaturesAura.MOD_ID + ":infused_iron", 19, new int[]{2, 5, 6, 2}, 16, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 0F, () -> Ingredient.fromItems(ModItems.INFUSED_IRON));
@ -26,7 +26,7 @@ public enum NAArmorMaterial implements IArmorMaterial {
private final float toughness;
private final LazyLoadBase<Ingredient> repairMaterial;
NAArmorMaterial(String nameIn, int maxDamageFactorIn, int[] damageReductionAmountsIn, int enchantabilityIn, SoundEvent equipSoundIn, float toughness, Supplier<Ingredient> repairMaterialSupplier) {
ModArmorMaterial(String nameIn, int maxDamageFactorIn, int[] damageReductionAmountsIn, int enchantabilityIn, SoundEvent equipSoundIn, float toughness, Supplier<Ingredient> repairMaterialSupplier) {
this.name = nameIn;
this.maxDamageFactor = maxDamageFactorIn;
this.damageReductionAmountArray = damageReductionAmountsIn;

4
src/main/java/de/ellpeck/naturesaura/reg/NAItemTier.java → src/main/java/de/ellpeck/naturesaura/reg/ModItemTier.java
View file

@ -7,7 +7,7 @@ import net.minecraft.util.LazyLoadBase;
import java.util.function.Supplier;
public enum NAItemTier implements IItemTier {
public enum ModItemTier implements IItemTier {
INFUSED(2, 250, 6.0F, 2.0F, 14, () -> Ingredient.fromItems(ModItems.INFUSED_IRON));
private final int harvestLevel;
@ -17,7 +17,7 @@ public enum NAItemTier implements IItemTier {
private final int enchantability;
private final LazyLoadBase<Ingredient> repairMaterial;
NAItemTier(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, Supplier<Ingredient> repairMaterialIn) {
ModItemTier(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, Supplier<Ingredient> repairMaterialIn) {
this.harvestLevel = harvestLevelIn;
this.maxUses = maxUsesIn;
this.efficiency = efficiencyIn;

50
src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java
View file

@ -132,35 +132,35 @@ public final class ModRegistry {
Item temp;
event.getRegistry().registerAll(
new Pickaxe("infused_iron_pickaxe", NAItemTier.INFUSED, 1, -2.8F),
new Axe("infused_iron_axe", NAItemTier.INFUSED, 6.0F, -3.1F),
new Shovel("infused_iron_shovel", NAItemTier.INFUSED, 1.5F, -3.0F),
new Hoe("infused_iron_hoe", NAItemTier.INFUSED, -1.0F),
new Sword("infused_iron_sword", NAItemTier.INFUSED, 3, -2.4F),
new Armor("infused_iron_helmet", NAArmorMaterial.INFUSED, EquipmentSlotType.HEAD),
new Armor("infused_iron_chest", NAArmorMaterial.INFUSED, EquipmentSlotType.CHEST),
new Armor("infused_iron_pants", NAArmorMaterial.INFUSED, EquipmentSlotType.LEGS),
new Armor("infused_iron_shoes", NAArmorMaterial.INFUSED, EquipmentSlotType.FEET),
new Eye("eye"),
new Eye("eye_improved"),
new GoldFiber(),
new ItemPickaxe("infused_iron_pickaxe", ModItemTier.INFUSED, 1, -2.8F),
new ItemAxe("infused_iron_axe", ModItemTier.INFUSED, 6.0F, -3.1F),
new ItemShovel("infused_iron_shovel", ModItemTier.INFUSED, 1.5F, -3.0F),
new ItemHoe("infused_iron_hoe", ModItemTier.INFUSED, -1.0F),
new ItemSword("infused_iron_sword", ModItemTier.INFUSED, 3, -2.4F),
new ItemArmor("infused_iron_helmet", ModArmorMaterial.INFUSED, EquipmentSlotType.HEAD),
new ItemArmor("infused_iron_chest", ModArmorMaterial.INFUSED, EquipmentSlotType.CHEST),
new ItemArmor("infused_iron_pants", ModArmorMaterial.INFUSED, EquipmentSlotType.LEGS),
new ItemArmor("infused_iron_shoes", ModArmorMaterial.INFUSED, EquipmentSlotType.FEET),
new ItemEye("eye"),
new ItemEye("eye_improved"),
new ItemGoldFiber(),
new ItemImpl("gold_leaf"),
new ItemImpl("infused_iron"),
new ItemImpl("ancient_stick"),
new ColorChanger(),
new AuraCache("aura_cache", 400000),
new AuraCache("aura_trove", 1200000),
new ShockwaveCreator(),
new MultiblockMaker(),
new ItemColorChanger(),
new ItemAuraCache("aura_cache", 400000),
new ItemAuraCache("aura_trove", 1200000),
new ItemShockwaveCreator(),
new ItemMultiblockMaker(),
temp = new ItemImpl("bottle_two_the_rebottling"),
new AuraBottle(temp),
new ItemAuraBottle(temp),
new ItemImpl("farming_stencil"),
new ItemImpl("sky_ingot"),
new Glowing("calling_spirit"),
new EffectPowder(),
new BirthSpirit(),
new MoverMinecart(),
new RangeVisualizer(),
new ItemGlowing("calling_spirit"),
new ItemEffectPowder(),
new ItemBirthSpirit(),
new ItemMoverMinecart(),
new ItemRangeVisualizer(),
new ItemImpl("clock_hand"),
new ItemImpl("token_joy"),
new ItemImpl("token_fear"),
@ -170,8 +170,8 @@ public final class ModRegistry {
new ItemImpl("token_terror"),
new ItemImpl("token_rage"),
new ItemImpl("token_grief"),
new EnderAccess(),
new CaveFinder()
new ItemEnderAccess(),
new ItemCaveFinder()
);
Helper.populateObjectHolders(ModItems.class, event.getRegistry());
}