fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Major Refactoring of Bootstrap Code (#75)

Browse Source 
- Refactored boostrap code:
  * Completely reworked item/block/tile registration.
  * Fixed server side startup.
  * Fixed server side startup.
  * More documentation.
  * More heavy cleanup
  * More cleanups.
  * Major refactoring of state mapping and fixes a lot of other issue related to item rendering.
  * Fixes sky chest item models (no item TESR).
  * Only use CachingRotatingBakedModel for tile entities automatically.
  Fix default rotation of quartz pillar for item model.
  * Used method reference instead of lambda for ItemMeshDefinition for multiparts.
  * Removed unnecessary IHasSpecialItemModel
  * Removed unused IconReg class.
  * Updated resource pack version.
This commit is contained in:
shartte
2016-08-22 14:25:10 +02:00
committed by Sebastian Hartte
parent 66df324ef0
commit 6f2bbfab4c
172 changed files with 2289 additions and 2863 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/tools/ToolBiometricCard.java
-2
View File
@@ -38,7 +38,6 @@ import appeng.api.config.SecurityPermissions;
import appeng.api.features.IPlayerRegistry;
import appeng.api.implementations.items.IBiometricCard;
import appeng.api.networking.security.ISecurityRegistry;
import appeng.core.features.AEFeature;
import appeng.core.localization.GuiText;
import appeng.items.AEBaseItem;
import appeng.util.Platform;
@@ -48,7 +47,6 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard
{
public ToolBiometricCard()
{
this.setFeature( EnumSet.of( AEFeature.Security ) );
this.setMaxStackSize( 1 );
if( Platform.isClient() )
src/main/java/appeng/items/tools/ToolMemoryCard.java
-3
View File
@@ -19,7 +19,6 @@
package appeng.items.tools;
import java.util.EnumSet;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
@@ -35,7 +34,6 @@ import net.minecraft.world.World;
import appeng.api.implementations.items.IMemoryCard;
import appeng.api.implementations.items.MemoryCardMessages;
import appeng.core.features.AEFeature;
import appeng.core.localization.GuiText;
import appeng.core.localization.PlayerMessages;
import appeng.items.AEBaseItem;
@@ -46,7 +44,6 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard
{
public ToolMemoryCard()
{
this.setFeature( EnumSet.of( AEFeature.Core ) );
this.setMaxStackSize( 1 );
}
src/main/java/appeng/items/tools/ToolNetworkTool.java
-8
View File
@@ -19,10 +19,6 @@
package appeng.items.tools;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -48,7 +44,6 @@ import appeng.api.util.DimensionalCoord;
import appeng.api.util.INetworkToolAgent;
import appeng.client.ClientHelper;
import appeng.container.AEBaseContainer;
import appeng.core.features.AEFeature;
import appeng.core.sync.GuiBridge;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketClick;
@@ -64,9 +59,6 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench /
public ToolNetworkTool()
{
super( Optional.<String>absent() );
this.setFeature( EnumSet.of( AEFeature.NetworkTool ) );
this.setMaxStackSize( 1 );
this.setHarvestLevel( "wrench", 0 );
}
src/main/java/appeng/items/tools/powered/ToolChargedStaff.java
+1 -7
View File
@@ -19,17 +19,12 @@
package appeng.items.tools.powered;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.util.math.AxisAlignedBB;
import appeng.core.AEConfig;
import appeng.core.features.AEFeature;
import appeng.core.sync.packets.PacketLightning;
import appeng.items.tools.powered.powersink.AEBasePoweredItem;
import appeng.server.ServerHelper;
@@ -41,8 +36,7 @@ public class ToolChargedStaff extends AEBasePoweredItem
public ToolChargedStaff()
{
super( AEConfig.instance.chargedStaffBattery, Optional.<String>absent() );
this.setFeature( EnumSet.of( AEFeature.ChargedStaff, AEFeature.PoweredTools ) );
super( AEConfig.instance.chargedStaffBattery );
}
@Override
src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
+2 -8
View File
@@ -21,15 +21,12 @@ package appeng.items.tools.powered;
import java.util.Collections;
import java.util.Comparator;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.common.base.Optional;
import net.minecraft.block.Block;
import net.minecraft.block.BlockColored;
import net.minecraft.block.BlockDispenser;
@@ -67,7 +64,6 @@ import appeng.api.util.DimensionalCoord;
import appeng.block.misc.BlockPaint;
import appeng.block.networking.BlockCableBus;
import appeng.core.AEConfig;
import appeng.core.features.AEFeature;
import appeng.core.localization.GuiText;
import appeng.helpers.IMouseWheelItem;
import appeng.hooks.DispenserBlockTool;
@@ -104,8 +100,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
public ToolColorApplicator()
{
super( AEConfig.instance.colorApplicatorBattery, Optional.<String>absent() );
this.setFeature( EnumSet.of( AEFeature.ColorApplicator, AEFeature.PoweredTools ) );
super( AEConfig.instance.colorApplicatorBattery );
if( Platform.isClient() )
{
// TODO - color applicator
@@ -113,10 +108,9 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
}
}
@Override
public void postInit()
{
super.postInit();
// TODO BOOTSTRAP
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( this, new DispenserBlockTool() );
}
src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java
+2 -9
View File
@@ -20,13 +20,10 @@ package appeng.items.tools.powered;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.google.common.base.Optional;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDispenser;
import net.minecraft.block.BlockTNT;
@@ -52,7 +49,6 @@ import net.minecraft.world.World;
import appeng.api.util.DimensionalCoord;
import appeng.block.misc.BlockTinyTNT;
import appeng.core.AEConfig;
import appeng.core.features.AEFeature;
import appeng.hooks.DispenserBlockTool;
import appeng.hooks.IBlockTool;
import appeng.items.tools.powered.powersink.AEBasePoweredItem;
@@ -67,9 +63,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
public ToolEntropyManipulator()
{
super( AEConfig.instance.entropyManipulatorBattery, Optional.<String>absent() );
this.setFeature( EnumSet.of( AEFeature.EntropyManipulator, AEFeature.PoweredTools ) );
super( AEConfig.instance.entropyManipulatorBattery );
this.heatUp = new HashMap<InWorldToolOperationIngredient, InWorldToolOperationResult>();
this.coolDown = new HashMap<InWorldToolOperationIngredient, InWorldToolOperationResult>();
@@ -91,10 +85,9 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
this.heatUp.put( new InWorldToolOperationIngredient( Blocks.SNOW, true ), new InWorldToolOperationResult( new ItemStack( Blocks.FLOWING_WATER ) ) );
}
@Override
public void postInit()
{
super.postInit();
// TODO BOOTSTRAP
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( this, new DispenserBlockTool() );
}
src/main/java/appeng/items/tools/powered/ToolMassCannon.java
+2 -8
View File
@@ -19,13 +19,9 @@
package appeng.items.tools.powered;
import java.util.EnumSet;
import java.util.List;
import javax.annotation.Nullable;
import com.google.common.base.Optional;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDispenser;
import net.minecraft.block.state.IBlockState;
@@ -89,14 +85,12 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
public ToolMassCannon()
{
super( AEConfig.instance.matterCannonBattery, Optional.<String>absent() );
this.setFeature( EnumSet.of( AEFeature.MatterCannon, AEFeature.PoweredTools ) );
super( AEConfig.instance.matterCannonBattery );
}
@Override
public void postInit()
{
super.postInit();
// TODO BOOTSTRAP
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( this, new DispenserMatterCannon() );
}
src/main/java/appeng/items/tools/powered/ToolPortableCell.java
+1 -6
View File
@@ -19,12 +19,9 @@
package appeng.items.tools.powered;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
import com.google.common.base.Optional;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
@@ -49,7 +46,6 @@ import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AEPartLocation;
import appeng.core.AEConfig;
import appeng.core.features.AEFeature;
import appeng.core.localization.GuiText;
import appeng.core.sync.GuiBridge;
import appeng.items.contents.CellConfig;
@@ -64,8 +60,7 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell,
{
public ToolPortableCell()
{
super( AEConfig.instance.portableCellBattery, Optional.<String>absent() );
this.setFeature( EnumSet.of( AEFeature.PortableCell, AEFeature.StorageCells, AEFeature.PoweredTools ) );
super( AEConfig.instance.portableCellBattery );
}
@Override
src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java
+1 -6
View File
@@ -19,11 +19,8 @@
package appeng.items.tools.powered;
import java.util.EnumSet;
import java.util.List;
import com.google.common.base.Optional;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -43,7 +40,6 @@ import appeng.api.config.ViewItems;
import appeng.api.features.IWirelessTermHandler;
import appeng.api.util.IConfigManager;
import appeng.core.AEConfig;
import appeng.core.features.AEFeature;
import appeng.core.localization.GuiText;
import appeng.items.tools.powered.powersink.AEBasePoweredItem;
import appeng.util.ConfigManager;
@@ -56,8 +52,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
public ToolWirelessTerminal()
{
super( AEConfig.instance.wirelessTerminalBattery, Optional.<String>absent() );
this.setFeature( EnumSet.of( AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools ) );
super( AEConfig.instance.wirelessTerminalBattery );
}
@Override
src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java
+2 -5
View File
@@ -19,14 +19,11 @@
package appeng.items.tools.powered.powersink;
import com.google.common.base.Optional;
public abstract class AEBasePoweredItem extends AERootPoweredItem
{
public AEBasePoweredItem( final double powerCapacity, final Optional<String> subName )
public AEBasePoweredItem( final double powerCapacity )
{
super( powerCapacity, subName );
super( powerCapacity );
this.setMaxStackSize( 1 );
}
src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java
+1 -4
View File
@@ -22,8 +22,6 @@ package appeng.items.tools.powered.powersink;
import java.text.MessageFormat;
import java.util.List;
import com.google.common.base.Optional;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -43,9 +41,8 @@ public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPow
private static final String POWER_NBT_KEY = "internalCurrentPower";
private final double powerCapacity;
public AERootPoweredItem( final double powerCapacity, final Optional<String> subName )
public AERootPoweredItem( final double powerCapacity )
{
super( subName );
this.setMaxDamage( 32 );
this.hasSubtypes = false;
this.setFull3D();
src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java
+2 -22
View File
@@ -19,41 +19,21 @@
package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemStack;
import appeng.core.features.AEFeature;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
public class ToolQuartzAxe extends ItemAxe implements IAEFeature
public class ToolQuartzAxe extends ItemAxe
{
private final AEFeature type;
private final IFeatureHandler feature;
public ToolQuartzAxe( final AEFeature type )
{
super( ToolMaterial.IRON );
this.feature = new ItemFeatureHandler( EnumSet.of( this.type = type, AEFeature.QuartzAxe ), this, this, Optional.of( type.name() ) );
}
@Override
public IFeatureHandler handler()
{
return this.feature;
}
@Override
public void postInit()
{
// override!
this.type = type;
}
@Override
src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java
-7
View File
@@ -19,10 +19,6 @@
package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
@@ -48,10 +44,7 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem
public ToolQuartzCuttingKnife( final AEFeature type )
{
super( Optional.of( type.name() ) );
this.type = type;
this.setFeature( EnumSet.of( type, AEFeature.QuartzKnife ) );
this.setMaxDamage( 50 );
this.setMaxStackSize( 1 );
}
src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java
+6 -27
View File
@@ -19,48 +19,27 @@
package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemHoe;
import net.minecraft.item.ItemStack;
import appeng.core.features.AEFeature;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
public class ToolQuartzHoe extends ItemHoe implements IAEFeature
public class ToolQuartzHoe extends ItemHoe
{
private final AEFeature feature;
private final IFeatureHandler handler;
private final AEFeature type;
public ToolQuartzHoe( final AEFeature feature )
public ToolQuartzHoe( final AEFeature type )
{
super( ToolMaterial.IRON );
this.feature = feature;
this.handler = new ItemFeatureHandler( EnumSet.of( feature, AEFeature.QuartzHoe ), this, this, Optional.of( feature.name() ) );
}
@Override
public IFeatureHandler handler()
{
return this.handler;
}
@Override
public void postInit()
{
// override!
this.type = type;
}
@Override
public boolean getIsRepairable( final ItemStack a, final ItemStack b )
{
return Platform.canRepair( this.feature, a, b );
return Platform.canRepair( this.type, a, b );
}
}
src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java
+1 -23
View File
@@ -19,43 +19,21 @@
package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack;
import appeng.core.features.AEFeature;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
public class ToolQuartzPickaxe extends ItemPickaxe implements IAEFeature
public class ToolQuartzPickaxe extends ItemPickaxe
{
private final AEFeature type;
private final IFeatureHandler feature;
public ToolQuartzPickaxe( final AEFeature type )
{
super( ToolMaterial.IRON );
this.type = type;
this.feature = new ItemFeatureHandler( EnumSet.of( type, AEFeature.QuartzPickaxe ), this, this, Optional.of( type.name() ) );
}
@Override
public IFeatureHandler handler()
{
return this.feature;
}
@Override
public void postInit()
{
// override!
}
@Override
src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java
+2 -23
View File
@@ -19,42 +19,21 @@
package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemSpade;
import net.minecraft.item.ItemStack;
import appeng.core.features.AEFeature;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
public class ToolQuartzSpade extends ItemSpade implements IAEFeature
public class ToolQuartzSpade extends ItemSpade
{
private final AEFeature type;
private final IFeatureHandler handler;
public ToolQuartzSpade( final AEFeature type )
{
super( ToolMaterial.IRON );
this.handler = new ItemFeatureHandler( EnumSet.of( this.type = type, AEFeature.QuartzSpade ), this, this, Optional.of( type.name() ) );
}
@Override
public IFeatureHandler handler()
{
return this.handler;
}
@Override
public void postInit()
{
// override!
this.type = type;
}
@Override
src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java
+3 -23
View File
@@ -19,41 +19,21 @@
package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import appeng.core.features.AEFeature;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
public class ToolQuartzSword extends ItemSword implements IAEFeature
public class ToolQuartzSword extends ItemSword
{
private final AEFeature type;
private final IFeatureHandler feature;
public ToolQuartzSword( final AEFeature type )
public ToolQuartzSword( AEFeature type )
{
super( ToolMaterial.IRON );
this.feature = new ItemFeatureHandler( EnumSet.of( this.type = type, AEFeature.QuartzSword ), this, this, Optional.of( type.name() ) );
}
@Override
public IFeatureHandler handler()
{
return this.feature;
}
@Override
public void postInit()
{
// override!
this.type = type;
}
@Override
src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java
+1 -9
View File
@@ -19,10 +19,6 @@
package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -35,7 +31,6 @@ import net.minecraft.world.World;
import appeng.api.implementations.items.IAEWrench;
import appeng.api.util.DimensionalCoord;
import appeng.core.features.AEFeature;
import appeng.items.AEBaseItem;
import appeng.util.Platform;
@@ -45,11 +40,8 @@ import appeng.util.Platform;
public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /* , IToolWrench */
{
public ToolQuartzWrench( final AEFeature type )
public ToolQuartzWrench()
{
super( Optional.of( type.name() ) );
this.setFeature( EnumSet.of( type, AEFeature.QuartzWrench ) );
this.setMaxStackSize( 1 );
this.setHarvestLevel( "wrench", 0 );
}