From ea10da6f69a40d40ccbcb7dda2f9e1c1b3fff657 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Thu, 6 Nov 2014 19:34:01 +0100 Subject: [PATCH] Restore default constructor of EntityItem with single argument. Potentially fixes #400 --- .../java/appeng/entity/AEBaseEntityItem.java | 9 +++- .../appeng/entity/EntityChargedQuartz.java | 42 +++++++++++++++---- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/src/main/java/appeng/entity/AEBaseEntityItem.java b/src/main/java/appeng/entity/AEBaseEntityItem.java index 6eac2d192..3b39dac2d 100644 --- a/src/main/java/appeng/entity/AEBaseEntityItem.java +++ b/src/main/java/appeng/entity/AEBaseEntityItem.java @@ -30,9 +30,14 @@ import java.util.List; public abstract class AEBaseEntityItem extends EntityItem { - public AEBaseEntityItem( World p_i1710_1_, double p_i1710_2_, double p_i1710_4_, double p_i1710_6_, ItemStack p_i1710_8_ ) + public AEBaseEntityItem( World world ) { - super( p_i1710_1_, p_i1710_2_, p_i1710_4_, p_i1710_6_, p_i1710_8_ ); + super( world ); + } + + public AEBaseEntityItem( World world, double x, double y, double z, ItemStack stack ) + { + super( world, x, y, z, stack ); } @SuppressWarnings( "unchecked" ) diff --git a/src/main/java/appeng/entity/EntityChargedQuartz.java b/src/main/java/appeng/entity/EntityChargedQuartz.java index efb8dc999..7bd2a0a8a 100644 --- a/src/main/java/appeng/entity/EntityChargedQuartz.java +++ b/src/main/java/appeng/entity/EntityChargedQuartz.java @@ -1,7 +1,29 @@ +/* + * This file is part of Applied Energistics 2. + * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * + * Applied Energistics 2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Applied Energistics 2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Applied Energistics 2. If not, see . + */ + package appeng.entity; -import java.util.List; - +import appeng.api.AEApi; +import appeng.client.EffectType; +import appeng.core.AEConfig; +import appeng.core.CommonHelper; +import appeng.core.features.AEFeature; +import appeng.util.Platform; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -10,12 +32,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import appeng.api.AEApi; -import appeng.client.EffectType; -import appeng.core.AEConfig; -import appeng.core.CommonHelper; -import appeng.core.features.AEFeature; -import appeng.util.Platform; + +import java.util.List; final public class EntityChargedQuartz extends AEBaseEntityItem { @@ -23,7 +41,13 @@ final public class EntityChargedQuartz extends AEBaseEntityItem int delay = 0; int transformTime = 0; - public EntityChargedQuartz(World w, double x, double y, double z, ItemStack is) { + public EntityChargedQuartz(World w) + { + super( w ); + } + + public EntityChargedQuartz(World w, double x, double y, double z, ItemStack is) + { super( w, x, y, z, is ); }