From aff3941729398d9acd560cb5270b393b0a17e010 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Tue, 16 Feb 2016 21:06:59 +0100 Subject: [PATCH] Make the project buildable with gradlew build by externalizing the model generator and expose it as an interface --- gradle/wrapper/gradle-wrapper.properties | 4 +- .../java/appeng/api/parts/IFacadePart.java | 2 +- src/api/java/appeng/api/parts/IPart.java | 6 +- .../appeng/api/parts/IPartRenderHelper.java | 15 +-- .../java/appeng/api/storage/ICellHandler.java | 2 +- .../java/appeng/api/util}/IAESprite.java | 2 +- .../java/appeng/api/util/ModelGenerator.java | 118 ++++++++++++++++++ src/main/java/appeng/block/AEBaseBlock.java | 2 +- .../block/crafting/BlockCraftingMonitor.java | 2 +- .../block/crafting/BlockCraftingStorage.java | 3 +- .../block/crafting/BlockCraftingUnit.java | 3 +- .../block/misc/BlockVibrationChamber.java | 4 +- .../networking/BlockDenseEnergyCell.java | 3 +- .../block/networking/BlockEnergyCell.java | 3 +- src/main/java/appeng/client/SmartModel.java | 7 +- ...nerator.java => BakingModelGenerator.java} | 67 ++++++---- .../appeng/client/render/BaseBlockRender.java | 4 +- .../appeng/client/render/BlockRenderInfo.java | 2 +- .../appeng/client/render/BusRenderHelper.java | 4 +- .../appeng/client/render/BusRenderer.java | 3 + .../client/render/CableRenderHelper.java | 1 + .../render/ISimpleBlockRenderingHandler.java | 4 +- .../appeng/client/render/IconUnwrapper.java | 2 +- .../client/render/RenderBlocksWorkaround.java | 2 +- .../appeng/client/render/TESRWrapper.java | 3 +- .../appeng/client/render/WorldRender.java | 3 +- .../render/blocks/RenderBlockAssembler.java | 4 +- .../render/blocks/RenderBlockCharger.java | 2 +- .../render/blocks/RenderBlockController.java | 2 +- .../render/blocks/RenderBlockCraftingCPU.java | 4 +- .../blocks/RenderBlockCraftingCPUMonitor.java | 2 +- .../render/blocks/RenderBlockCrank.java | 2 +- .../render/blocks/RenderBlockEnergyCube.java | 2 +- .../render/blocks/RenderBlockInscriber.java | 4 +- .../render/blocks/RenderBlockInterface.java | 4 +- .../render/blocks/RenderBlockPaint.java | 4 +- .../blocks/RenderBlockQuartzAccelerator.java | 4 +- .../render/blocks/RenderBlockSkyChest.java | 2 +- .../render/blocks/RenderBlockSkyCompass.java | 2 +- .../render/blocks/RenderBlockWireless.java | 4 +- .../client/render/blocks/RenderDrive.java | 4 +- .../client/render/blocks/RenderMEChest.java | 4 +- .../client/render/blocks/RenderNull.java | 2 +- .../client/render/blocks/RenderQNB.java | 4 +- .../render/blocks/RenderQuartzGlass.java | 2 +- .../client/render/blocks/RenderQuartzOre.java | 2 +- .../render/blocks/RenderQuartzTorch.java | 2 +- .../render/blocks/RenderSpatialPylon.java | 4 +- .../client/render/blocks/RenderTinyTNT.java | 2 +- .../render/blocks/RendererCableBus.java | 2 +- .../render/blocks/RendererSecurity.java | 4 +- .../java/appeng/client/texture/BaseIcon.java | 2 + .../client/texture/CableBusTextures.java | 1 + .../client/texture/ExtraBlockTextures.java | 1 + .../client/texture/ExtraItemTextures.java | 1 + .../appeng/client/texture/FlippableIcon.java | 2 + .../java/appeng/client/texture/FullIcon.java | 2 + .../appeng/client/texture/MissingIcon.java | 2 + .../appeng/client/texture/OffsetIcon.java | 2 + .../appeng/client/texture/TaughtIcon.java | 2 + .../client/texture/TmpFlippableIcon.java | 3 + .../registries/entries/BasicCellHandler.java | 2 +- .../entries/CreativeCellHandler.java | 2 +- .../appeng/entity/RenderTinyTNTPrimed.java | 5 +- src/main/java/appeng/facade/FacadePart.java | 5 +- .../abstraction/IBuildCraftTransport.java | 2 +- src/main/java/appeng/items/AEBaseItem.java | 2 +- .../appeng/items/parts/ItemMultiPart.java | 3 +- src/main/java/appeng/parts/AEBasePart.java | 2 +- .../java/appeng/parts/PartBasicState.java | 2 +- .../automation/PartAnnihilationPlane.java | 4 +- .../parts/automation/PartExportBus.java | 2 +- .../parts/automation/PartFormationPlane.java | 2 +- .../PartIdentityAnnihilationPlane.java | 4 +- .../parts/automation/PartImportBus.java | 2 +- .../parts/automation/PartLevelEmitter.java | 4 +- .../appeng/parts/misc/PartCableAnchor.java | 4 +- .../java/appeng/parts/misc/PartInterface.java | 2 +- .../appeng/parts/misc/PartStorageBus.java | 2 +- .../java/appeng/parts/misc/PartToggleBus.java | 2 +- .../appeng/parts/networking/PartCable.java | 4 +- .../parts/networking/PartCableCovered.java | 4 +- .../parts/networking/PartCableSmart.java | 4 +- .../parts/networking/PartDenseCable.java | 4 +- .../parts/networking/PartQuartzFiber.java | 4 +- .../java/appeng/parts/p2p/PartP2PTunnel.java | 4 +- .../parts/reporting/AbstractPartDisplay.java | 4 +- .../parts/reporting/AbstractPartMonitor.java | 2 +- .../parts/reporting/AbstractPartPanel.java | 4 +- 89 files changed, 307 insertions(+), 143 deletions(-) rename src/{main/java/appeng/client/texture => api/java/appeng/api/util}/IAESprite.java (92%) create mode 100644 src/api/java/appeng/api/util/ModelGenerator.java rename src/main/java/appeng/client/render/{ModelGenerator.java => BakingModelGenerator.java} (87%) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c441b054..ea7cafb9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Feb 16 19:55:25 CET 2016 +#Tue Feb 16 20:36:24 CET 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip diff --git a/src/api/java/appeng/api/parts/IFacadePart.java b/src/api/java/appeng/api/parts/IFacadePart.java index 0117dcb4..170a9d47 100644 --- a/src/api/java/appeng/api/parts/IFacadePart.java +++ b/src/api/java/appeng/api/parts/IFacadePart.java @@ -33,7 +33,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.util.AEPartLocation; -import appeng.client.render.ModelGenerator; +import appeng.api.util.ModelGenerator; /** diff --git a/src/api/java/appeng/api/parts/IPart.java b/src/api/java/appeng/api/parts/IPart.java index bb4f9ee1..8df58e77 100644 --- a/src/api/java/appeng/api/parts/IPart.java +++ b/src/api/java/appeng/api/parts/IPart.java @@ -45,7 +45,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.networking.IGridNode; import appeng.api.util.AEPartLocation; -import appeng.client.render.ModelGenerator; +import appeng.api.util.ModelGenerator; public interface IPart extends IBoxProvider @@ -81,9 +81,7 @@ public interface IPart extends IBoxProvider * * GL is NOT Available * - * @param x x coord - * @param y y coord - * @param z z coord + * @param pos pos of block * @param rh helper * @param renderer renderer */ diff --git a/src/api/java/appeng/api/parts/IPartRenderHelper.java b/src/api/java/appeng/api/parts/IPartRenderHelper.java index d0b80d32..b2e10073 100644 --- a/src/api/java/appeng/api/parts/IPartRenderHelper.java +++ b/src/api/java/appeng/api/parts/IPartRenderHelper.java @@ -32,13 +32,12 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import appeng.client.render.ModelGenerator; -import appeng.client.texture.IAESprite; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; public interface IPartRenderHelper { - /** * sets the Render Helpers Block Bounds. 0.0 - 16.0 block coords. * @@ -85,9 +84,7 @@ public interface IPartRenderHelper * * render a block of specified bounds. * - * @param x x pos of block - * @param y y pos of block - * @param z z pos of block + * @param pos pos of block * @param renderer renderer */ @SideOnly( Side.CLIENT ) @@ -96,7 +93,7 @@ public interface IPartRenderHelper /** * render a single face in inventory renderer. * - * @param TextureAtlasSprite icon of part + * @param IIcon icon of part * @param direction face of part * @param renderer renderer */ @@ -164,9 +161,7 @@ public interface IPartRenderHelper /** * render a block using the current renderer state. * - * @param x x pos of part - * @param y y pos of part - * @param z z pos of part + * @param pos pos of part * @param renderer renderer of part */ void renderBlockCurrentBounds( BlockPos pos, ModelGenerator renderer ); diff --git a/src/api/java/appeng/api/storage/ICellHandler.java b/src/api/java/appeng/api/storage/ICellHandler.java index 5ef6f293..a8dcbeab 100644 --- a/src/api/java/appeng/api/storage/ICellHandler.java +++ b/src/api/java/appeng/api/storage/ICellHandler.java @@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.implementations.tiles.IChestOrDrive; -import appeng.client.texture.IAESprite; +import appeng.api.util.IAESprite; /** diff --git a/src/main/java/appeng/client/texture/IAESprite.java b/src/api/java/appeng/api/util/IAESprite.java similarity index 92% rename from src/main/java/appeng/client/texture/IAESprite.java rename to src/api/java/appeng/api/util/IAESprite.java index 4f068ac0..e76ece1c 100644 --- a/src/main/java/appeng/client/texture/IAESprite.java +++ b/src/api/java/appeng/api/util/IAESprite.java @@ -1,5 +1,5 @@ -package appeng.client.texture; +package appeng.api.util; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/src/api/java/appeng/api/util/ModelGenerator.java b/src/api/java/appeng/api/util/ModelGenerator.java new file mode 100644 index 00000000..9acdfe11 --- /dev/null +++ b/src/api/java/appeng/api/util/ModelGenerator.java @@ -0,0 +1,118 @@ +package appeng.api.util; + + +import java.util.EnumSet; + +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; + + +/** + * TODO replace with description + * + * TODO replace with intention + * + * @author thatsIch + * @version rv3 - 16.02.2016 + * @see //TODO anything to see? + * @since rv3 - 16.02.2016 + */ +public interface ModelGenerator +{ + int setUvRotateBottom( int i ); + + int setUvRotateTop( int i ); + + int setUvRotateEast( int i ); + + int setUvRotateWest( int i ); + + int setUvRotateNorth( int i ); + + int setUvRotateSouth( int i ); + + IAESprite[] getIcon( IBlockState iBlockState ); + + IAESprite getOverrideBlockTexture(); + + IBlockAccess getBlockAccess(); + + void setBlockAccess( IBlockAccess theWorld ); + + void setRenderAllFaces( boolean b ); + + void setOverrideBlockTexture( IAESprite o ); + + void setFlipTexture( boolean b ); + + void setRenderBoundsFromBlock( Block block ); + + void setRenderBounds( double v, double v1, double v2, double v3, double v4, double v5 ); + + boolean renderStandardBlock( Block block, BlockPos pos ); + + void setRenderFaces( EnumSet faces ); + + void setNormal( float v, float v1, float v2 ); + + void setColorOpaque_I( int color ); + + void setRenderMinX( double min ); + + void setRenderMinY( double min ); + + void setRenderMinZ( double min ); + + void setRenderMaxX( double max ); + + void setRenderMaxY( double max ); + + void setRenderMaxZ( double max ); + + void addVertexWithUV( EnumFacing face, double v, double v1, double v2, double interpolatedU, double interpolatedV ); + + void renderFaceZNeg( Block block, BlockPos pos, IAESprite ico ); + + void renderFaceZPos( Block block, BlockPos pos, IAESprite ico ); + + void renderFaceXPos( Block block, BlockPos pos, IAESprite ico ); + + void renderFaceXNeg( Block block, BlockPos pos, IAESprite ico ); + + void renderFaceYPos( Block block, BlockPos pos, IAESprite ico ); + + void renderFaceYNeg( Block block, BlockPos pos, IAESprite ico ); + + void setTranslation( int i, int i1, int i2 ); + + IAESprite getIcon( ItemStack itemStack ); + + void setBrightness( int i ); + + void setColorOpaque_F( float v, float v1, float v2 ); + + boolean isAlphaPass(); + + void setColorRGBA_F( int i, int i1, int i2, float v ); + + double getRenderMinX(); + + double getRenderMaxX(); + + double getRenderMinY(); + + double getRenderMaxY(); + + double getRenderMinZ(); + + double getRenderMaxZ(); + + void finalizeModel( boolean b ); + + IBakedModel getOutput(); +} diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index aa9e7211..1be93892 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -54,13 +54,13 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; import appeng.api.util.IOrientable; import appeng.api.util.IOrientableBlock; import appeng.client.render.BaseBlockRender; import appeng.client.render.BlockRenderInfo; import appeng.client.texture.BaseIcon; import appeng.client.texture.FlippableIcon; -import appeng.client.texture.IAESprite; import appeng.core.AppEng; import appeng.core.features.AEBlockFeatureHandler; import appeng.core.features.AEFeature; diff --git a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java index 2b207260..e5d9e3f8 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java @@ -31,10 +31,10 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.AEApi; +import appeng.api.util.IAESprite; import appeng.client.render.BaseBlockRender; import appeng.client.render.blocks.RenderBlockCraftingCPUMonitor; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.tile.crafting.TileCraftingMonitorTile; diff --git a/src/main/java/appeng/block/crafting/BlockCraftingStorage.java b/src/main/java/appeng/block/crafting/BlockCraftingStorage.java index ecce70af..3f8c8f1f 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingStorage.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingStorage.java @@ -27,6 +27,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import appeng.api.util.IAESprite; import appeng.client.texture.ExtraBlockTextures; import appeng.tile.crafting.TileCraftingStorageTile; @@ -47,7 +48,7 @@ public class BlockCraftingStorage extends BlockCraftingUnit } @Override - public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final net.minecraft.block.state.IBlockState state ) + public IAESprite getIcon( final net.minecraft.util.EnumFacing side, final net.minecraft.block.state.IBlockState state ) { final boolean formed = (boolean) state.getValue( FORMED ); switch( this.type ) diff --git a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java index 576bcff7..8e37a7ff 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java @@ -41,6 +41,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; import appeng.block.AEBaseTileBlock; import appeng.client.render.BaseBlockRender; import appeng.client.render.blocks.RenderBlockCraftingCPU; @@ -148,7 +149,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock } @Override - public appeng.client.texture.IAESprite getIcon( final EnumFacing side, final IBlockState state ) + public IAESprite getIcon( final EnumFacing side, final IBlockState state ) { if( this.type == CraftingUnitType.ACCELERATOR ) { diff --git a/src/main/java/appeng/block/misc/BlockVibrationChamber.java b/src/main/java/appeng/block/misc/BlockVibrationChamber.java index 668a48e6..97c1ba67 100644 --- a/src/main/java/appeng/block/misc/BlockVibrationChamber.java +++ b/src/main/java/appeng/block/misc/BlockVibrationChamber.java @@ -32,9 +32,9 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; import appeng.block.AEBaseTileBlock; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.core.AEConfig; import appeng.core.features.AEFeature; import appeng.core.sync.GuiBridge; @@ -55,7 +55,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock } @Override - public appeng.client.texture.IAESprite getIcon( final IBlockAccess w, final BlockPos pos, final EnumFacing side ) + public IAESprite getIcon( final IBlockAccess w, final BlockPos pos, final EnumFacing side ) { final IAESprite ico = super.getIcon( w, pos, side ); final TileVibrationChamber tvc = this.getTileEntity( w, pos ); diff --git a/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java b/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java index 116a0baa..0dc346ee 100644 --- a/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java @@ -21,6 +21,7 @@ package appeng.block.networking; import java.util.EnumSet; +import appeng.api.util.IAESprite; import appeng.client.texture.ExtraBlockTextures; import appeng.core.features.AEFeature; import appeng.tile.networking.TileDenseEnergyCell; @@ -36,7 +37,7 @@ public class BlockDenseEnergyCell extends BlockEnergyCell } @Override - public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final net.minecraft.block.state.IBlockState state ) + public IAESprite getIcon( final net.minecraft.util.EnumFacing side, final net.minecraft.block.state.IBlockState state ) { switch( (int) state.getValue( ENERGY_STORAGE ) ) { diff --git a/src/main/java/appeng/block/networking/BlockEnergyCell.java b/src/main/java/appeng/block/networking/BlockEnergyCell.java index 94cd4f71..ea2c746d 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockEnergyCell.java @@ -32,6 +32,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import appeng.api.util.IAESprite; import appeng.block.AEBaseItemBlock; import appeng.block.AEBaseItemBlockChargeable; import appeng.block.AEBaseTileBlock; @@ -76,7 +77,7 @@ public class BlockEnergyCell extends AEBaseTileBlock } @Override - public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final IBlockState state ) + public IAESprite getIcon( final net.minecraft.util.EnumFacing side, final IBlockState state ) { switch( (int) state.getValue( ENERGY_STORAGE ) ) { diff --git a/src/main/java/appeng/client/SmartModel.java b/src/main/java/appeng/client/SmartModel.java index 491ee810..66359834 100644 --- a/src/main/java/appeng/client/SmartModel.java +++ b/src/main/java/appeng/client/SmartModel.java @@ -19,9 +19,10 @@ import net.minecraftforge.client.model.ISmartItemModel; import net.minecraftforge.common.property.IExtendedBlockState; import appeng.api.util.AEPartLocation; +import appeng.api.util.ModelGenerator; import appeng.block.AEBaseBlock; +import appeng.client.render.BakingModelGenerator; import appeng.client.render.BlockRenderInfo; -import appeng.client.render.ModelGenerator; import appeng.client.texture.MissingIcon; @@ -81,7 +82,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode @Override public IBakedModel handleItemState( final ItemStack stack ) { - final ModelGenerator helper = new ModelGenerator(); + final ModelGenerator helper = new BakingModelGenerator(); final Block blk = Block.getBlockFromItem( stack.getItem() ); helper.setRenderBoundsFromBlock( blk ); this.aeRenderer.getRendererInstance().renderInventory( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, stack, helper, ItemRenderType.INVENTORY, null ); @@ -92,7 +93,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode @Override public IBakedModel handleBlockState( final IBlockState state ) { - final ModelGenerator helper = new ModelGenerator(); + final ModelGenerator helper = new BakingModelGenerator(); final Block blk = state.getBlock(); final BlockPos pos = ( (IExtendedBlockState) state ).getValue( AEBaseBlock.AE_BLOCK_POS ); final IBlockAccess world = ( (IExtendedBlockState) state ).getValue( AEBaseBlock.AE_BLOCK_ACCESS ); diff --git a/src/main/java/appeng/client/render/ModelGenerator.java b/src/main/java/appeng/client/render/BakingModelGenerator.java similarity index 87% rename from src/main/java/appeng/client/render/ModelGenerator.java rename to src/main/java/appeng/client/render/BakingModelGenerator.java index aeca45b4..966044d8 100644 --- a/src/main/java/appeng/client/render/ModelGenerator.java +++ b/src/main/java/appeng/client/render/BakingModelGenerator.java @@ -1,4 +1,3 @@ - package appeng.client.render; @@ -28,17 +27,17 @@ import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.model.IColoredBakedQuad; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.block.AEBaseBlock; import appeng.client.texture.BaseIcon; -import appeng.client.texture.IAESprite; import appeng.client.texture.MissingIcon; import appeng.items.AEBaseItem; import appeng.items.parts.ItemMultiPart; -public class ModelGenerator +public class BakingModelGenerator implements ModelGenerator { - private static final class CachedModel implements IBakedModel { private final List[] faces = new List[6]; @@ -96,6 +95,7 @@ public class ModelGenerator } } + private int uvRotateBottom; private int uvRotateEast; private int uvRotateNorth; @@ -175,21 +175,21 @@ public class ModelGenerator { final int alpha = 0xff; this.color = // alpha << 24 | - whiteVariant; + whiteVariant; } public void setColorOpaque( final int r, final int g, final int b ) { final int alpha = 0xff; this.color = // alpha << 24 | - r << 16 | g << 8 | b; + r << 16 | g << 8 | b; } public void setColorOpaque_F( final int r, final int g, final int b ) { final int alpha = 0xff; this.color = // alpha << 24 | - Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) ); + Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) ); } public void setColorOpaque_F( final float rf, final float bf, final float gf ) @@ -199,7 +199,7 @@ public class ModelGenerator final int b = (int) ( bf * 0xff ); final int alpha = 0xff; this.color = // alpha << 24 | - Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) ); + Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) ); } public IAESprite getIcon( final ItemStack is ) @@ -298,13 +298,39 @@ public class ModelGenerator if( this.point == 4 ) { this.brightness = -1; - final int[] vertData = { Float.floatToRawIntBits( this.points[0][0] ), Float.floatToRawIntBits( this.points[0][1] ), Float.floatToRawIntBits( this.points[0][2] ), this.brightness, Float.floatToRawIntBits( this.points[0][3] ), Float.floatToRawIntBits( this.points[0][4] ), 0, + final int[] vertData = { + Float.floatToRawIntBits( this.points[0][0] ), + Float.floatToRawIntBits( this.points[0][1] ), + Float.floatToRawIntBits( this.points[0][2] ), + this.brightness, + Float.floatToRawIntBits( this.points[0][3] ), + Float.floatToRawIntBits( this.points[0][4] ), + 0, - Float.floatToRawIntBits( this.points[1][0] ), Float.floatToRawIntBits( this.points[1][1] ), Float.floatToRawIntBits( this.points[1][2] ), this.brightness, Float.floatToRawIntBits( this.points[1][3] ), Float.floatToRawIntBits( this.points[1][4] ), 0, + Float.floatToRawIntBits( this.points[1][0] ), + Float.floatToRawIntBits( this.points[1][1] ), + Float.floatToRawIntBits( this.points[1][2] ), + this.brightness, + Float.floatToRawIntBits( this.points[1][3] ), + Float.floatToRawIntBits( this.points[1][4] ), + 0, - Float.floatToRawIntBits( this.points[2][0] ), Float.floatToRawIntBits( this.points[2][1] ), Float.floatToRawIntBits( this.points[2][2] ), this.brightness, Float.floatToRawIntBits( this.points[2][3] ), Float.floatToRawIntBits( this.points[2][4] ), 0, + Float.floatToRawIntBits( this.points[2][0] ), + Float.floatToRawIntBits( this.points[2][1] ), + Float.floatToRawIntBits( this.points[2][2] ), + this.brightness, + Float.floatToRawIntBits( this.points[2][3] ), + Float.floatToRawIntBits( this.points[2][4] ), + 0, - Float.floatToRawIntBits( this.points[3][0] ), Float.floatToRawIntBits( this.points[3][1] ), Float.floatToRawIntBits( this.points[3][2] ), this.brightness, Float.floatToRawIntBits( this.points[3][3] ), Float.floatToRawIntBits( this.points[3][4] ), 0, }; + Float.floatToRawIntBits( this.points[3][0] ), + Float.floatToRawIntBits( this.points[3][1] ), + Float.floatToRawIntBits( this.points[3][2] ), + this.brightness, + Float.floatToRawIntBits( this.points[3][3] ), + Float.floatToRawIntBits( this.points[3][4] ), + 0, + }; this.generatedModel.general.add( new IColoredBakedQuad.ColoredBakedQuad( vertData, this.color, face ) ); @@ -395,17 +421,17 @@ public class ModelGenerator to_b = 1.0f - to_b; final float[] afloat = {// :P - 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * from_b ), // 0 - 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * from_b ), // 1 + 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * from_b ), // 0 + 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * from_b ), // 1 - 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * from_b ), // 2 - 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * from_b ), // 3 + 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * from_b ), // 2 + 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * from_b ), // 3 - 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * to_b ), // 2 - 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * to_b ), // 3 + 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * to_b ), // 2 + 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * to_b ), // 3 - 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * to_b ), // 0 - 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * to_b ), // 1 + 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * to_b ), // 0 + 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * to_b ), // 1 }; return afloat; @@ -720,5 +746,4 @@ public class ModelGenerator { this.renderFaces = renderFaces; } - } diff --git a/src/main/java/appeng/client/render/BaseBlockRender.java b/src/main/java/appeng/client/render/BaseBlockRender.java index 610d2316..57cccf02 100644 --- a/src/main/java/appeng/client/render/BaseBlockRender.java +++ b/src/main/java/appeng/client/render/BaseBlockRender.java @@ -21,7 +21,6 @@ package appeng.client.render; import java.nio.FloatBuffer; import java.util.EnumSet; - import javax.annotation.Nullable; import org.lwjgl.BufferUtils; @@ -43,10 +42,11 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; import appeng.api.util.IOrientable; +import appeng.api.util.ModelGenerator; import appeng.block.AEBaseBlock; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.core.AppEng; import appeng.tile.AEBaseTile; import appeng.util.Platform; diff --git a/src/main/java/appeng/client/render/BlockRenderInfo.java b/src/main/java/appeng/client/render/BlockRenderInfo.java index 9da15eca..a2b558a6 100644 --- a/src/main/java/appeng/client/render/BlockRenderInfo.java +++ b/src/main/java/appeng/client/render/BlockRenderInfo.java @@ -20,8 +20,8 @@ package appeng.client.render; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; import appeng.client.texture.FlippableIcon; -import appeng.client.texture.IAESprite; import appeng.client.texture.TmpFlippableIcon; diff --git a/src/main/java/appeng/client/render/BusRenderHelper.java b/src/main/java/appeng/client/render/BusRenderHelper.java index e96a4300..27a216a5 100644 --- a/src/main/java/appeng/client/render/BusRenderHelper.java +++ b/src/main/java/appeng/client/render/BusRenderHelper.java @@ -20,7 +20,6 @@ package appeng.client.render; import java.util.EnumSet; - import javax.annotation.Nullable; import com.google.common.base.Function; @@ -37,8 +36,9 @@ import appeng.api.exceptions.MissingDefinition; import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.block.AEBaseBlock; -import appeng.client.texture.IAESprite; import appeng.core.AEConfig; import appeng.core.features.AEFeature; import appeng.tile.AEBaseTile; diff --git a/src/main/java/appeng/client/render/BusRenderer.java b/src/main/java/appeng/client/render/BusRenderer.java index 8adafc22..6d20bb07 100644 --- a/src/main/java/appeng/client/render/BusRenderer.java +++ b/src/main/java/appeng/client/render/BusRenderer.java @@ -19,6 +19,9 @@ package appeng.client.render; +import appeng.api.util.ModelGenerator; + + public class BusRenderer { diff --git a/src/main/java/appeng/client/render/CableRenderHelper.java b/src/main/java/appeng/client/render/CableRenderHelper.java index 8f0fc5c3..2ab32c62 100644 --- a/src/main/java/appeng/client/render/CableRenderHelper.java +++ b/src/main/java/appeng/client/render/CableRenderHelper.java @@ -34,6 +34,7 @@ import appeng.api.parts.IFacadePart; import appeng.api.parts.IPart; import appeng.api.util.AEAxisAlignedBB; import appeng.api.util.AEPartLocation; +import appeng.api.util.ModelGenerator; import appeng.parts.BusCollisionHelper; import appeng.parts.CableBusContainer; diff --git a/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java b/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java index c9c33243..4cca71d5 100644 --- a/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java +++ b/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java @@ -6,12 +6,12 @@ import net.minecraft.block.Block; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; +import appeng.api.util.ModelGenerator; + public interface ISimpleBlockRenderingHandler { - void renderInventoryBlock( Block block, int metadata, int modelID, ModelGenerator renderer ); boolean renderWorldBlock( IBlockAccess world, BlockPos pos, Block block, int modelId, ModelGenerator renderer ); - } diff --git a/src/main/java/appeng/client/render/IconUnwrapper.java b/src/main/java/appeng/client/render/IconUnwrapper.java index 5ecf021b..7b2c1d8c 100644 --- a/src/main/java/appeng/client/render/IconUnwrapper.java +++ b/src/main/java/appeng/client/render/IconUnwrapper.java @@ -4,7 +4,7 @@ package appeng.client.render; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import appeng.client.texture.IAESprite; +import appeng.api.util.IAESprite; public class IconUnwrapper extends TextureAtlasSprite diff --git a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java index 1a30983b..2c56f7c4 100644 --- a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java +++ b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly( Side.CLIENT ) -public class RenderBlocksWorkaround extends ModelGenerator +public class RenderBlocksWorkaround extends BakingModelGenerator { private boolean flipTexture; diff --git a/src/main/java/appeng/client/render/TESRWrapper.java b/src/main/java/appeng/client/render/TESRWrapper.java index 9203fcfd..61961363 100644 --- a/src/main/java/appeng/client/render/TESRWrapper.java +++ b/src/main/java/appeng/client/render/TESRWrapper.java @@ -28,6 +28,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import appeng.api.util.ModelGenerator; import appeng.block.AEBaseBlock; import appeng.core.AELog; import appeng.tile.AEBaseTile; @@ -37,7 +38,7 @@ import appeng.tile.AEBaseTile; public class TESRWrapper extends TileEntitySpecialRenderer { - private final ModelGenerator renderBlocksInstance = new ModelGenerator(); + private final ModelGenerator renderBlocksInstance = new BakingModelGenerator(); private final BaseBlockRender blkRender; private final double maxDistance; diff --git a/src/main/java/appeng/client/render/WorldRender.java b/src/main/java/appeng/client/render/WorldRender.java index 5c79e549..d04b54c8 100644 --- a/src/main/java/appeng/client/render/WorldRender.java +++ b/src/main/java/appeng/client/render/WorldRender.java @@ -28,6 +28,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import appeng.api.util.ModelGenerator; import appeng.block.AEBaseBlock; import appeng.client.ItemRenderType; import appeng.core.AELog; @@ -39,7 +40,7 @@ public final class WorldRender implements ISimpleBlockRenderingHandler private static final WorldRender INSTANCE = new WorldRender(); private final HashMap blockRenders = new HashMap(); - private final ModelGenerator renderer = new ModelGenerator(); + private final ModelGenerator renderer = new BakingModelGenerator(); private boolean hasError = false; private WorldRender() diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java index f61a11a2..9fb53360 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java @@ -33,14 +33,14 @@ import appeng.api.parts.IPart; import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; import appeng.api.util.IOrientable; +import appeng.api.util.ModelGenerator; import appeng.block.crafting.BlockMolecularAssembler; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.BusRenderer; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.client.texture.TaughtIcon; import appeng.parts.networking.PartCable; import appeng.tile.crafting.TileMolecularAssembler; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java b/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java index 9346ab92..7f9f61f2 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java @@ -34,10 +34,10 @@ import net.minecraft.world.IBlockAccess; import appeng.api.util.AEPartLocation; import appeng.api.util.IOrientable; +import appeng.api.util.ModelGenerator; import appeng.block.misc.BlockCharger; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; import appeng.core.AELog; import appeng.tile.misc.TileCharger; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockController.java b/src/main/java/appeng/client/render/blocks/RenderBlockController.java index 7448a405..b6c01dd0 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockController.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockController.java @@ -24,10 +24,10 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; +import appeng.api.util.ModelGenerator; import appeng.block.networking.BlockController; import appeng.block.networking.BlockController.ControllerBlockState; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; import appeng.tile.networking.TileController; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java b/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java index 54e27415..c6513c0a 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java @@ -32,14 +32,14 @@ import net.minecraftforge.client.MinecraftForgeClient; import appeng.api.AEApi; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.block.crafting.BlockCraftingMonitor; import appeng.block.crafting.BlockCraftingUnit; import appeng.client.render.BaseBlockRender; import appeng.client.render.BusRenderHelper; import appeng.client.render.BusRenderer; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.tile.crafting.TileCraftingMonitorTile; import appeng.tile.crafting.TileCraftingTile; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPUMonitor.java b/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPUMonitor.java index 6d93396f..fbdaf397 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPUMonitor.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPUMonitor.java @@ -31,9 +31,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import appeng.api.storage.data.IAEItemStack; +import appeng.api.util.ModelGenerator; import appeng.block.crafting.BlockCraftingMonitor; import appeng.client.ClientHelper; -import appeng.client.render.ModelGenerator; import appeng.core.AELog; import appeng.tile.crafting.TileCraftingMonitorTile; import appeng.util.IWideReadableNumberConverter; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockCrank.java b/src/main/java/appeng/client/render/blocks/RenderBlockCrank.java index fb59d034..e6656c2b 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockCrank.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockCrank.java @@ -31,10 +31,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; +import appeng.api.util.ModelGenerator; import appeng.block.grindstone.BlockCrank; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.tile.grindstone.TileCrank; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java b/src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java index 00a0dc45..0ffdd3e7 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java @@ -24,10 +24,10 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import appeng.api.implementations.items.IAEItemPowerStorage; +import appeng.api.util.ModelGenerator; import appeng.block.networking.BlockEnergyCell; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.tile.networking.TileEnergyCell; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java index fe853e5a..d2b58192 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java @@ -38,14 +38,14 @@ import net.minecraft.world.IBlockAccess; import appeng.api.features.IInscriberRecipe; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; import appeng.api.util.IOrientable; +import appeng.api.util.ModelGenerator; import appeng.block.AEBaseBlock; import appeng.block.misc.BlockInscriber; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.core.AELog; import appeng.tile.AEBaseTile; import appeng.tile.misc.TileInscriber; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockInterface.java b/src/main/java/appeng/client/render/blocks/RenderBlockInterface.java index 41e0f0df..b8a65ed7 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockInterface.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockInterface.java @@ -22,12 +22,12 @@ package appeng.client.render.blocks; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.block.misc.BlockInterface; import appeng.client.render.BaseBlockRender; import appeng.client.render.BlockRenderInfo; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.tile.misc.TileInterface; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockPaint.java b/src/main/java/appeng/client/render/blocks/RenderBlockPaint.java index b0f7d274..8303a3df 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockPaint.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockPaint.java @@ -26,12 +26,12 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.block.misc.BlockPaint; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.helpers.Splotch; import appeng.tile.misc.TilePaint; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java b/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java index fdc69270..f34e73b3 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java @@ -23,11 +23,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.block.misc.BlockQuartzGrowthAccelerator; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.tile.misc.TileQuartzGrowthAccelerator; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java b/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java index 2c494c92..550e3ccb 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java @@ -31,11 +31,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; +import appeng.api.util.ModelGenerator; import appeng.block.storage.BlockSkyChest; import appeng.block.storage.BlockSkyChest.SkyChestType; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.tile.storage.TileSkyChest; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java b/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java index 67868195..4f0bcea5 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java @@ -30,10 +30,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; +import appeng.api.util.ModelGenerator; import appeng.block.misc.BlockSkyCompass; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.client.render.model.ModelCompass; import appeng.hooks.CompassManager; import appeng.hooks.CompassResult; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java b/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java index 474326a4..4b5c7f33 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java @@ -28,14 +28,14 @@ import net.minecraft.world.IBlockAccess; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.block.networking.BlockWireless; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.BlockRenderInfo; -import appeng.client.render.ModelGenerator; import appeng.client.texture.CableBusTextures; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.client.texture.OffsetIcon; import appeng.tile.networking.TileWireless; import appeng.util.Platform; diff --git a/src/main/java/appeng/client/render/blocks/RenderDrive.java b/src/main/java/appeng/client/render/blocks/RenderDrive.java index 68707d3d..7c3a5870 100644 --- a/src/main/java/appeng/client/render/blocks/RenderDrive.java +++ b/src/main/java/appeng/client/render/blocks/RenderDrive.java @@ -27,12 +27,12 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.block.storage.BlockDrive; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.tile.storage.TileDrive; import appeng.util.Platform; diff --git a/src/main/java/appeng/client/render/blocks/RenderMEChest.java b/src/main/java/appeng/client/render/blocks/RenderMEChest.java index 2fd517a1..25758c38 100644 --- a/src/main/java/appeng/client/render/blocks/RenderMEChest.java +++ b/src/main/java/appeng/client/render/blocks/RenderMEChest.java @@ -30,13 +30,13 @@ import appeng.api.AEApi; import appeng.api.storage.ICellHandler; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.block.storage.BlockChest; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; import appeng.client.texture.FlippableIcon; -import appeng.client.texture.IAESprite; import appeng.client.texture.OffsetIcon; import appeng.tile.storage.TileChest; import appeng.util.Platform; diff --git a/src/main/java/appeng/client/render/blocks/RenderNull.java b/src/main/java/appeng/client/render/blocks/RenderNull.java index 4d71c6fb..c4d88198 100644 --- a/src/main/java/appeng/client/render/blocks/RenderNull.java +++ b/src/main/java/appeng/client/render/blocks/RenderNull.java @@ -23,10 +23,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; +import appeng.api.util.ModelGenerator; import appeng.block.AEBaseBlock; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.tile.AEBaseTile; diff --git a/src/main/java/appeng/client/render/blocks/RenderQNB.java b/src/main/java/appeng/client/render/blocks/RenderQNB.java index d1d6b4b4..3c176430 100644 --- a/src/main/java/appeng/client/render/blocks/RenderQNB.java +++ b/src/main/java/appeng/client/render/blocks/RenderQNB.java @@ -35,12 +35,12 @@ import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IParts; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.block.qnb.BlockQuantumBase; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.tile.qnb.TileQuantumBridge; diff --git a/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java b/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java index b64c65f9..d40b02d7 100644 --- a/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java +++ b/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java @@ -27,9 +27,9 @@ import net.minecraft.world.IBlockAccess; import appeng.api.AEApi; import appeng.api.util.AEPartLocation; +import appeng.api.util.ModelGenerator; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; import appeng.client.texture.OffsetIcon; import appeng.decorative.solid.QuartzGlassBlock; diff --git a/src/main/java/appeng/client/render/blocks/RenderQuartzOre.java b/src/main/java/appeng/client/render/blocks/RenderQuartzOre.java index 511ac3a9..2a4bac2e 100644 --- a/src/main/java/appeng/client/render/blocks/RenderQuartzOre.java +++ b/src/main/java/appeng/client/render/blocks/RenderQuartzOre.java @@ -23,9 +23,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; +import appeng.api.util.ModelGenerator; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; import appeng.decorative.solid.QuartzOreBlock; import appeng.tile.AEBaseTile; diff --git a/src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java b/src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java index c82d667b..d80a1e59 100644 --- a/src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java +++ b/src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java @@ -29,10 +29,10 @@ import net.minecraft.world.IBlockAccess; import appeng.api.util.AEPartLocation; import appeng.api.util.IOrientable; import appeng.api.util.IOrientableBlock; +import appeng.api.util.ModelGenerator; import appeng.block.AEBaseBlock; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.tile.AEBaseTile; diff --git a/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java b/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java index 07c73ff2..18af8d89 100644 --- a/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java +++ b/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java @@ -25,13 +25,13 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.block.spatial.BlockSpatialPylon; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.BlockRenderInfo; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.tile.spatial.TileSpatialPylon; diff --git a/src/main/java/appeng/client/render/blocks/RenderTinyTNT.java b/src/main/java/appeng/client/render/blocks/RenderTinyTNT.java index 05232e98..86cf1940 100644 --- a/src/main/java/appeng/client/render/blocks/RenderTinyTNT.java +++ b/src/main/java/appeng/client/render/blocks/RenderTinyTNT.java @@ -25,10 +25,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; +import appeng.api.util.ModelGenerator; import appeng.block.misc.BlockTinyTNT; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.client.texture.FullIcon; import appeng.tile.AEBaseTile; diff --git a/src/main/java/appeng/client/render/blocks/RendererCableBus.java b/src/main/java/appeng/client/render/blocks/RendererCableBus.java index 9bb8f2b7..b3fb4340 100644 --- a/src/main/java/appeng/client/render/blocks/RendererCableBus.java +++ b/src/main/java/appeng/client/render/blocks/RendererCableBus.java @@ -33,13 +33,13 @@ import appeng.api.parts.IFacadePart; import appeng.api.parts.IPart; import appeng.api.parts.IPartItem; import appeng.api.util.AEPartLocation; +import appeng.api.util.ModelGenerator; import appeng.block.networking.BlockCableBus; import appeng.client.ClientHelper; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.BusRenderHelper; import appeng.client.render.BusRenderer; -import appeng.client.render.ModelGenerator; import appeng.facade.IFacadeItem; import appeng.tile.AEBaseTile; import appeng.tile.networking.TileCableBus; diff --git a/src/main/java/appeng/client/render/blocks/RendererSecurity.java b/src/main/java/appeng/client/render/blocks/RendererSecurity.java index e346aaf2..ca3a55e5 100644 --- a/src/main/java/appeng/client/render/blocks/RendererSecurity.java +++ b/src/main/java/appeng/client/render/blocks/RendererSecurity.java @@ -28,12 +28,12 @@ import net.minecraft.world.IBlockAccess; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.block.misc.BlockSecurity; import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; -import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.tile.misc.TileSecurity; diff --git a/src/main/java/appeng/client/texture/BaseIcon.java b/src/main/java/appeng/client/texture/BaseIcon.java index 365c12e5..ddb1f8ad 100644 --- a/src/main/java/appeng/client/texture/BaseIcon.java +++ b/src/main/java/appeng/client/texture/BaseIcon.java @@ -4,6 +4,8 @@ package appeng.client.texture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import appeng.api.util.IAESprite; + public class BaseIcon implements IAESprite { diff --git a/src/main/java/appeng/client/texture/CableBusTextures.java b/src/main/java/appeng/client/texture/CableBusTextures.java index c69d1886..51db92a1 100644 --- a/src/main/java/appeng/client/texture/CableBusTextures.java +++ b/src/main/java/appeng/client/texture/CableBusTextures.java @@ -26,6 +26,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import appeng.api.util.IAESprite; import appeng.core.AppEng; diff --git a/src/main/java/appeng/client/texture/ExtraBlockTextures.java b/src/main/java/appeng/client/texture/ExtraBlockTextures.java index f4c38b6a..c79972fc 100644 --- a/src/main/java/appeng/client/texture/ExtraBlockTextures.java +++ b/src/main/java/appeng/client/texture/ExtraBlockTextures.java @@ -25,6 +25,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import appeng.api.util.IAESprite; import appeng.core.AppEng; diff --git a/src/main/java/appeng/client/texture/ExtraItemTextures.java b/src/main/java/appeng/client/texture/ExtraItemTextures.java index 8100fbe4..6819c6c3 100644 --- a/src/main/java/appeng/client/texture/ExtraItemTextures.java +++ b/src/main/java/appeng/client/texture/ExtraItemTextures.java @@ -22,6 +22,7 @@ package appeng.client.texture; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; +import appeng.api.util.IAESprite; import appeng.core.AppEng; diff --git a/src/main/java/appeng/client/texture/FlippableIcon.java b/src/main/java/appeng/client/texture/FlippableIcon.java index 5ca13949..d7406bec 100644 --- a/src/main/java/appeng/client/texture/FlippableIcon.java +++ b/src/main/java/appeng/client/texture/FlippableIcon.java @@ -23,6 +23,8 @@ import javax.annotation.Nonnull; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import appeng.api.util.IAESprite; + public class FlippableIcon implements IAESprite { diff --git a/src/main/java/appeng/client/texture/FullIcon.java b/src/main/java/appeng/client/texture/FullIcon.java index bf03ea66..aba48388 100644 --- a/src/main/java/appeng/client/texture/FullIcon.java +++ b/src/main/java/appeng/client/texture/FullIcon.java @@ -23,6 +23,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import appeng.api.util.IAESprite; + public class FullIcon implements IAESprite { diff --git a/src/main/java/appeng/client/texture/MissingIcon.java b/src/main/java/appeng/client/texture/MissingIcon.java index acf83955..4160b3c1 100644 --- a/src/main/java/appeng/client/texture/MissingIcon.java +++ b/src/main/java/appeng/client/texture/MissingIcon.java @@ -25,6 +25,8 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import appeng.api.util.IAESprite; + public class MissingIcon implements IAESprite { diff --git a/src/main/java/appeng/client/texture/OffsetIcon.java b/src/main/java/appeng/client/texture/OffsetIcon.java index da6575c8..d98da42b 100644 --- a/src/main/java/appeng/client/texture/OffsetIcon.java +++ b/src/main/java/appeng/client/texture/OffsetIcon.java @@ -23,6 +23,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import appeng.api.util.IAESprite; + public class OffsetIcon implements IAESprite { diff --git a/src/main/java/appeng/client/texture/TaughtIcon.java b/src/main/java/appeng/client/texture/TaughtIcon.java index 711d8aa6..88848037 100644 --- a/src/main/java/appeng/client/texture/TaughtIcon.java +++ b/src/main/java/appeng/client/texture/TaughtIcon.java @@ -23,6 +23,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import appeng.api.util.IAESprite; + public class TaughtIcon implements IAESprite { diff --git a/src/main/java/appeng/client/texture/TmpFlippableIcon.java b/src/main/java/appeng/client/texture/TmpFlippableIcon.java index 7638c5ea..d7b1f44b 100644 --- a/src/main/java/appeng/client/texture/TmpFlippableIcon.java +++ b/src/main/java/appeng/client/texture/TmpFlippableIcon.java @@ -19,6 +19,9 @@ package appeng.client.texture; +import appeng.api.util.IAESprite; + + public class TmpFlippableIcon extends FlippableIcon { diff --git a/src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java b/src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java index be13d66f..19764a84 100644 --- a/src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java +++ b/src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java @@ -32,8 +32,8 @@ import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.ISaveProvider; import appeng.api.storage.StorageChannel; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.core.sync.GuiBridge; import appeng.me.storage.CellInventory; import appeng.me.storage.CellInventoryHandler; diff --git a/src/main/java/appeng/core/features/registries/entries/CreativeCellHandler.java b/src/main/java/appeng/core/features/registries/entries/CreativeCellHandler.java index 4b2c6a2d..dbb51e8b 100644 --- a/src/main/java/appeng/core/features/registries/entries/CreativeCellHandler.java +++ b/src/main/java/appeng/core/features/registries/entries/CreativeCellHandler.java @@ -30,8 +30,8 @@ import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.ISaveProvider; import appeng.api.storage.StorageChannel; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.IAESprite; import appeng.core.sync.GuiBridge; import appeng.items.storage.ItemCreativeStorageCell; import appeng.me.storage.CreativeCellInventory; diff --git a/src/main/java/appeng/entity/RenderTinyTNTPrimed.java b/src/main/java/appeng/entity/RenderTinyTNTPrimed.java index 53e6ecff..f25c7aa6 100644 --- a/src/main/java/appeng/entity/RenderTinyTNTPrimed.java +++ b/src/main/java/appeng/entity/RenderTinyTNTPrimed.java @@ -33,14 +33,15 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import appeng.client.render.ModelGenerator; +import appeng.api.util.ModelGenerator; +import appeng.client.render.BakingModelGenerator; @SideOnly( Side.CLIENT ) public class RenderTinyTNTPrimed extends Render { - private final ModelGenerator blockRenderer = new ModelGenerator(); + private final ModelGenerator blockRenderer = new BakingModelGenerator(); public RenderTinyTNTPrimed( final RenderManager p_i46134_1_ ) { diff --git a/src/main/java/appeng/facade/FacadePart.java b/src/main/java/appeng/facade/FacadePart.java index 56badf5c..2d4ab8c7 100644 --- a/src/main/java/appeng/facade/FacadePart.java +++ b/src/main/java/appeng/facade/FacadePart.java @@ -20,7 +20,6 @@ package appeng.facade; import java.util.EnumSet; - import javax.annotation.Nullable; import net.minecraft.block.Block; @@ -46,10 +45,10 @@ import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.client.render.BusRenderHelper; -import appeng.client.render.ModelGenerator; import appeng.client.render.RenderBlocksWorkaround; -import appeng.client.texture.IAESprite; import appeng.core.AELog; import appeng.integration.IntegrationRegistry; import appeng.integration.IntegrationType; diff --git a/src/main/java/appeng/integration/abstraction/IBuildCraftTransport.java b/src/main/java/appeng/integration/abstraction/IBuildCraftTransport.java index cad64b42..c87cff17 100644 --- a/src/main/java/appeng/integration/abstraction/IBuildCraftTransport.java +++ b/src/main/java/appeng/integration/abstraction/IBuildCraftTransport.java @@ -29,7 +29,7 @@ import net.minecraft.util.EnumFacing; import appeng.api.parts.IFacadePart; import appeng.api.util.AEPartLocation; -import appeng.client.texture.IAESprite; +import appeng.api.util.IAESprite; /** diff --git a/src/main/java/appeng/items/AEBaseItem.java b/src/main/java/appeng/items/AEBaseItem.java index 7af415e7..ab745d1c 100644 --- a/src/main/java/appeng/items/AEBaseItem.java +++ b/src/main/java/appeng/items/AEBaseItem.java @@ -32,8 +32,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import appeng.api.util.IAESprite; import appeng.client.ClientHelper; -import appeng.client.texture.IAESprite; import appeng.core.features.AEFeature; import appeng.core.features.FeatureNameExtractor; import appeng.core.features.IAEFeature; diff --git a/src/main/java/appeng/items/parts/ItemMultiPart.java b/src/main/java/appeng/items/parts/ItemMultiPart.java index 77883332..c598cdd3 100644 --- a/src/main/java/appeng/items/parts/ItemMultiPart.java +++ b/src/main/java/appeng/items/parts/ItemMultiPart.java @@ -29,7 +29,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; - import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -53,8 +52,8 @@ import appeng.api.parts.IPart; import appeng.api.parts.IPartHelper; import appeng.api.parts.IPartItem; import appeng.api.util.AEColor; +import appeng.api.util.IAESprite; import appeng.client.texture.BaseIcon; -import appeng.client.texture.IAESprite; import appeng.client.texture.MissingIcon; import appeng.core.AEConfig; import appeng.core.AppEng; diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index cd331bea..4b7d90e4 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -64,7 +64,7 @@ import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; -import appeng.client.render.ModelGenerator; +import appeng.api.util.ModelGenerator; import appeng.helpers.ICustomNameObject; import appeng.helpers.IPriorityHost; import appeng.me.helpers.AENetworkProxy; diff --git a/src/main/java/appeng/parts/PartBasicState.java b/src/main/java/appeng/parts/PartBasicState.java index 607db4f1..68aa53ff 100644 --- a/src/main/java/appeng/parts/PartBasicState.java +++ b/src/main/java/appeng/parts/PartBasicState.java @@ -36,7 +36,7 @@ import appeng.api.networking.events.MENetworkChannelsChanged; import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.parts.IPartRenderHelper; -import appeng.client.render.ModelGenerator; +import appeng.api.util.ModelGenerator; import appeng.client.texture.CableBusTextures; import appeng.me.GridAccessException; diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index 3727fd80..ff093cc3 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -57,9 +57,9 @@ import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AEPartLocation; -import appeng.client.render.ModelGenerator; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.client.texture.CableBusTextures; -import appeng.client.texture.IAESprite; import appeng.core.settings.TickRates; import appeng.core.sync.packets.PacketTransitionEffect; import appeng.hooks.TickHandler; diff --git a/src/main/java/appeng/parts/automation/PartExportBus.java b/src/main/java/appeng/parts/automation/PartExportBus.java index 2df7f684..10ebfd46 100644 --- a/src/main/java/appeng/parts/automation/PartExportBus.java +++ b/src/main/java/appeng/parts/automation/PartExportBus.java @@ -52,7 +52,7 @@ import appeng.api.parts.IPartRenderHelper; import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEMonitor; import appeng.api.storage.data.IAEItemStack; -import appeng.client.render.ModelGenerator; +import appeng.api.util.ModelGenerator; import appeng.client.texture.CableBusTextures; import appeng.core.AELog; import appeng.core.settings.TickRates; diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index d9cc01a8..0a4a5a6c 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -70,7 +70,7 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.api.util.AEPartLocation; import appeng.api.util.IConfigManager; -import appeng.client.render.ModelGenerator; +import appeng.api.util.ModelGenerator; import appeng.client.texture.CableBusTextures; import appeng.core.AEConfig; import appeng.core.sync.GuiBridge; diff --git a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java index 417ad65b..21c24fb4 100644 --- a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java @@ -37,9 +37,9 @@ import appeng.api.parts.IPart; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AEPartLocation; -import appeng.client.render.ModelGenerator; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.client.texture.CableBusTextures; -import appeng.client.texture.IAESprite; public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane diff --git a/src/main/java/appeng/parts/automation/PartImportBus.java b/src/main/java/appeng/parts/automation/PartImportBus.java index 4b60ae35..49f7e3da 100644 --- a/src/main/java/appeng/parts/automation/PartImportBus.java +++ b/src/main/java/appeng/parts/automation/PartImportBus.java @@ -45,7 +45,7 @@ import appeng.api.parts.IPartRenderHelper; import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEMonitor; import appeng.api.storage.data.IAEItemStack; -import appeng.client.render.ModelGenerator; +import appeng.api.util.ModelGenerator; import appeng.client.texture.CableBusTextures; import appeng.core.settings.TickRates; import appeng.core.sync.GuiBridge; diff --git a/src/main/java/appeng/parts/automation/PartLevelEmitter.java b/src/main/java/appeng/parts/automation/PartLevelEmitter.java index 003d7b1a..3b2da638 100644 --- a/src/main/java/appeng/parts/automation/PartLevelEmitter.java +++ b/src/main/java/appeng/parts/automation/PartLevelEmitter.java @@ -70,10 +70,10 @@ import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; import appeng.api.util.IConfigManager; -import appeng.client.render.ModelGenerator; +import appeng.api.util.ModelGenerator; import appeng.client.texture.CableBusTextures; -import appeng.client.texture.IAESprite; import appeng.core.sync.GuiBridge; import appeng.helpers.Reflected; import appeng.me.GridAccessException; diff --git a/src/main/java/appeng/parts/misc/PartCableAnchor.java b/src/main/java/appeng/parts/misc/PartCableAnchor.java index 64b9fb0c..b23808aa 100644 --- a/src/main/java/appeng/parts/misc/PartCableAnchor.java +++ b/src/main/java/appeng/parts/misc/PartCableAnchor.java @@ -46,8 +46,8 @@ import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.PartItemStack; import appeng.api.util.AEPartLocation; -import appeng.client.render.ModelGenerator; -import appeng.client.texture.IAESprite; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; public class PartCableAnchor implements IPart diff --git a/src/main/java/appeng/parts/misc/PartInterface.java b/src/main/java/appeng/parts/misc/PartInterface.java index b153fc18..5801cf8b 100644 --- a/src/main/java/appeng/parts/misc/PartInterface.java +++ b/src/main/java/appeng/parts/misc/PartInterface.java @@ -60,7 +60,7 @@ import appeng.api.storage.IStorageMonitorable; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; import appeng.api.util.IConfigManager; -import appeng.client.render.ModelGenerator; +import appeng.api.util.ModelGenerator; import appeng.client.texture.CableBusTextures; import appeng.core.sync.GuiBridge; import appeng.helpers.DualityInterface; diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index b9ade222..fd77a40f 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -66,7 +66,7 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.api.util.AEPartLocation; import appeng.api.util.IConfigManager; -import appeng.client.render.ModelGenerator; +import appeng.api.util.ModelGenerator; import appeng.client.texture.CableBusTextures; import appeng.core.settings.TickRates; import appeng.core.stats.Achievements; diff --git a/src/main/java/appeng/parts/misc/PartToggleBus.java b/src/main/java/appeng/parts/misc/PartToggleBus.java index b07db66c..605cbf9a 100644 --- a/src/main/java/appeng/parts/misc/PartToggleBus.java +++ b/src/main/java/appeng/parts/misc/PartToggleBus.java @@ -43,7 +43,7 @@ import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; -import appeng.client.render.ModelGenerator; +import appeng.api.util.ModelGenerator; import appeng.client.texture.CableBusTextures; import appeng.helpers.Reflected; import appeng.me.helpers.AENetworkProxy; diff --git a/src/main/java/appeng/parts/networking/PartCable.java b/src/main/java/appeng/parts/networking/PartCable.java index d3ae5959..fa8de0a1 100644 --- a/src/main/java/appeng/parts/networking/PartCable.java +++ b/src/main/java/appeng/parts/networking/PartCable.java @@ -53,12 +53,12 @@ import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.api.util.AEColoredItemDefinition; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; import appeng.api.util.IReadOnlyCollection; +import appeng.api.util.ModelGenerator; import appeng.block.AEBaseBlock; -import appeng.client.render.ModelGenerator; import appeng.client.texture.CableBusTextures; import appeng.client.texture.FlippableIcon; -import appeng.client.texture.IAESprite; import appeng.client.texture.TaughtIcon; import appeng.items.parts.ItemMultiPart; import appeng.me.GridAccessException; diff --git a/src/main/java/appeng/parts/networking/PartCableCovered.java b/src/main/java/appeng/parts/networking/PartCableCovered.java index e1da95cc..993713ab 100644 --- a/src/main/java/appeng/parts/networking/PartCableCovered.java +++ b/src/main/java/appeng/parts/networking/PartCableCovered.java @@ -41,8 +41,8 @@ import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; -import appeng.client.render.ModelGenerator; -import appeng.client.texture.IAESprite; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.client.texture.OffsetIcon; import appeng.helpers.Reflected; import appeng.util.Platform; diff --git a/src/main/java/appeng/parts/networking/PartCableSmart.java b/src/main/java/appeng/parts/networking/PartCableSmart.java index 2df6a13b..07c3348d 100644 --- a/src/main/java/appeng/parts/networking/PartCableSmart.java +++ b/src/main/java/appeng/parts/networking/PartCableSmart.java @@ -41,10 +41,10 @@ import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.block.AEBaseBlock; -import appeng.client.render.ModelGenerator; import appeng.client.texture.FlippableIcon; -import appeng.client.texture.IAESprite; import appeng.client.texture.OffsetIcon; import appeng.client.texture.TaughtIcon; import appeng.helpers.Reflected; diff --git a/src/main/java/appeng/parts/networking/PartDenseCable.java b/src/main/java/appeng/parts/networking/PartDenseCable.java index a06bb060..eea94246 100644 --- a/src/main/java/appeng/parts/networking/PartDenseCable.java +++ b/src/main/java/appeng/parts/networking/PartDenseCable.java @@ -44,11 +44,11 @@ import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.block.AEBaseBlock; -import appeng.client.render.ModelGenerator; import appeng.client.texture.CableBusTextures; import appeng.client.texture.FlippableIcon; -import appeng.client.texture.IAESprite; import appeng.client.texture.OffsetIcon; import appeng.client.texture.TaughtIcon; import appeng.helpers.Reflected; diff --git a/src/main/java/appeng/parts/networking/PartQuartzFiber.java b/src/main/java/appeng/parts/networking/PartQuartzFiber.java index e5366315..b0a09604 100644 --- a/src/main/java/appeng/parts/networking/PartQuartzFiber.java +++ b/src/main/java/appeng/parts/networking/PartQuartzFiber.java @@ -42,8 +42,8 @@ import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; -import appeng.client.render.ModelGenerator; -import appeng.client.texture.IAESprite; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.me.GridAccessException; import appeng.me.helpers.AENetworkProxy; import appeng.parts.AEBasePart; diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java index ab059629..554a6a52 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java @@ -49,9 +49,9 @@ import appeng.api.parts.IPartItem; import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.PartItemStack; import appeng.api.util.AEPartLocation; -import appeng.client.render.ModelGenerator; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.client.texture.CableBusTextures; -import appeng.client.texture.IAESprite; import appeng.core.AEConfig; import appeng.me.GridAccessException; import appeng.me.cache.P2PCache; diff --git a/src/main/java/appeng/parts/reporting/AbstractPartDisplay.java b/src/main/java/appeng/parts/reporting/AbstractPartDisplay.java index 3632cb68..d55e0b90 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartDisplay.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartDisplay.java @@ -26,9 +26,9 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.parts.IPartRenderHelper; -import appeng.client.render.ModelGenerator; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.client.texture.CableBusTextures; -import appeng.client.texture.IAESprite; /** diff --git a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java index ed19ec84..10cafc4d 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java @@ -52,8 +52,8 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.api.util.AEPartLocation; +import appeng.api.util.ModelGenerator; import appeng.client.ClientHelper; -import appeng.client.render.ModelGenerator; import appeng.core.AELog; import appeng.core.localization.PlayerMessages; import appeng.helpers.Reflected; diff --git a/src/main/java/appeng/parts/reporting/AbstractPartPanel.java b/src/main/java/appeng/parts/reporting/AbstractPartPanel.java index 1016cf9d..28d2641d 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartPanel.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartPanel.java @@ -27,9 +27,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AEColor; -import appeng.client.render.ModelGenerator; +import appeng.api.util.IAESprite; +import appeng.api.util.ModelGenerator; import appeng.client.texture.CableBusTextures; -import appeng.client.texture.IAESprite; /**