diff --git a/codeformat/codeformat.xml b/codeformat/codeformat.xml index be037c27c..43e084bd2 100644 --- a/codeformat/codeformat.xml +++ b/codeformat/codeformat.xml @@ -157,7 +157,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -285,7 +285,7 @@ - + diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index 054428bf5..8da5e6637 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -169,16 +169,16 @@ public class ClientHelper extends ServerHelper { } private void postPlayerRender(final RenderLivingEvent.Pre p) { -// FIXME final PlayerColor player = TickHandler.INSTANCE.getPlayerColors().get( p.getEntity().getEntityId() ); -// FIXME if( player != null ) -// FIXME { -// FIXME final AEColor col = player.myColor; -// FIXME final float r = 0xff & ( col.mediumVariant >> 16 ); -// FIXME final float g = 0xff & ( col.mediumVariant >> 8 ); -// FIXME final float b = 0xff & ( col.mediumVariant ); -// FIXME // FIXME: This is most certainly not going to work! -// FIXME GlStateManager.color4f( r / 255.0f, g / 255.0f, b / 255.0f, 1.0f ); -// FIXME } + // FIXME final PlayerColor player = TickHandler.INSTANCE.getPlayerColors().get( p.getEntity().getEntityId() ); + // FIXME if( player != null ) + // FIXME { + // FIXME final AEColor col = player.myColor; + // FIXME final float r = 0xff & ( col.mediumVariant >> 16 ); + // FIXME final float g = 0xff & ( col.mediumVariant >> 8 ); + // FIXME final float b = 0xff & ( col.mediumVariant ); + // FIXME // FIXME: This is most certainly not going to work! + // FIXME GlStateManager.color4f( r / 255.0f, g / 255.0f, b / 255.0f, 1.0f ); + // FIXME } } private void spawnVibrant(final World w, final double x, final double y, final double z) { diff --git a/src/main/java/appeng/client/render/StackSizeRenderer.java b/src/main/java/appeng/client/render/StackSizeRenderer.java index c6cf1e247..ccf571ad3 100644 --- a/src/main/java/appeng/client/render/StackSizeRenderer.java +++ b/src/main/java/appeng/client/render/StackSizeRenderer.java @@ -67,8 +67,7 @@ public class StackSizeRenderer { final float inverseScaleFactor = 1.0f / scaleFactor; final int offset = AEConfig.instance().isUseLargeFonts() ? 0 : -1; - TransformationMatrix tm = new TransformationMatrix(new Vector3f(0, 0, 300), // Taken from - // ItemRenderer.renderItemOverlayIntoGUI + TransformationMatrix tm = new TransformationMatrix(new Vector3f(0, 0, 300), // Taken from ItemRenderer.renderItemOverlayIntoGUI null, new Vector3f(scaleFactor, scaleFactor, scaleFactor), null); RenderSystem.disableBlend(); diff --git a/src/main/java/appeng/client/render/effects/LightningFX.java b/src/main/java/appeng/client/render/effects/LightningFX.java index 360cded14..9caf39e72 100644 --- a/src/main/java/appeng/client/render/effects/LightningFX.java +++ b/src/main/java/appeng/client/render/effects/LightningFX.java @@ -144,16 +144,16 @@ public class LightningFX extends SpriteTexturedParticle { for (int layer = 0; layer < 2; layer++) { if (layer == 0) { scale = 0.04; -// FIXME offX *= 0.001; -// FIXME offY *= 0.001; -// FIXME offZ *= 0.001; + // FIXME offX *= 0.001; + // FIXME offY *= 0.001; + // FIXME offZ *= 0.001; red = this.particleRed * j * 0.4f; green = this.particleGreen * j * 0.25f; blue = this.particleBlue * j * 0.45f; } else { -// FIXME offX = 0; -// FIXME offY = 0; -// FIXME offZ = 0; + // FIXME offX = 0; + // FIXME offY = 0; + // FIXME offZ = 0; scale = 0.02; red = this.particleRed * j * 0.9f; green = this.particleGreen * j * 0.65f; diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 0316326ad..c6ca6fcee 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -177,42 +177,6 @@ public final class AppEng { return this.registration.advancementTriggers; } -// @EventHandler -// private void preInit( final FMLPreInitializationEvent event ) -// { -// final Stopwatch watch = Stopwatch.createStarted(); -// this.configDirectory = new File( event.getModConfigurationDirectory().getPath(), "AppliedEnergistics2" ); -// -// final File configFile = new File( this.configDirectory, "AppliedEnergistics2.cfg" ); -// final File facadeFile = new File( this.configDirectory, "Facades.cfg" ); -// final File versionFile = new File( this.configDirectory, "VersionChecker.cfg" ); -// final File recipeFile = new File( this.configDirectory, "CustomRecipes.cfg" ); -// final Configuration recipeConfiguration = new Configuration( recipeFile ); -// -// AEConfig.init( configFile ); -// FacadeConfig.init( facadeFile ); -// -// AELog.info( "Pre Initialization ( started )" ); -// -// -// for( final IntegrationType type : IntegrationType.values() ) -// { -// IntegrationRegistry.INSTANCE.add( type ); -// } -// -// this.registration.preInitialize( event ); -// -// if( Platform.isClient() ) -// { -// AppEng.proxy.preinit(); -// } -// -// IntegrationRegistry.INSTANCE.preInit(); -// -// AELog.info( "Pre Initialization ( ended after " + watch.elapsed( TimeUnit.MILLISECONDS ) + "ms )" ); -// -// } - private void startService(final String serviceName, final Thread thread) { thread.setName(serviceName); thread.setPriority(Thread.MIN_PRIORITY); diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 2007758a6..5f046e68c 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -606,12 +606,12 @@ final class Registration { blocks.energyCell().maybeItem().ifPresent(cell -> registries.charger().addChargeRate(cell, 8000d)); blocks.energyCellDense().maybeItem().ifPresent(cell -> registries.charger().addChargeRate(cell, 16000d)); -// FIXME // add villager trading to black smiths for a few basic materials -// FIXME if( AEConfig.instance().isFeatureEnabled( AEFeature.VILLAGER_TRADING ) ) -// FIXME { -// FIXME // TODO: VILLAGER TRADING -// FIXME // VillagerRegistry.instance().getRegisteredVillagers().registerVillageTradeHandler( 3, new AETrading() ); -// FIXME } + // FIXME // add villager trading to black smiths for a few basic materials + // FIXME if( AEConfig.instance().isFeatureEnabled( AEFeature.VILLAGER_TRADING ) ) + // FIXME { + // FIXME // TODO: VILLAGER TRADING + // FIXME // VillagerRegistry.instance().getRegisteredVillagers().registerVillageTradeHandler( 3, new AETrading() ); + // FIXME } final IMovableRegistry mr = registries.movable(); diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index e7a41de08..aeaf0a6a5 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -73,22 +73,22 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry { this.addNewAttunement(blocks.energyCell(), TunnelType.FE_POWER); this.addNewAttunement(blocks.energyCellCreative(), TunnelType.FE_POWER); -// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 0 ), TunnelType.FE_POWER ); -// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 1 ), TunnelType.FE_POWER ); -// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 2 ), TunnelType.FE_POWER ); -// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 3 ), TunnelType.FE_POWER ); -// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 4 ), TunnelType.FE_POWER ); -// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 5 ), TunnelType.FE_POWER ); + // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 0 ), TunnelType.FE_POWER ); + // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 1 ), TunnelType.FE_POWER ); + // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 2 ), TunnelType.FE_POWER ); + // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 3 ), TunnelType.FE_POWER ); + // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 4 ), TunnelType.FE_POWER ); + // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 5 ), TunnelType.FE_POWER ); /** * EU tunnel items */ -// FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 0 ), TunnelType.IC2_POWER ); // Copper cable -// FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 1 ), TunnelType.IC2_POWER ); // Glass fibre cable -// FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 2 ), TunnelType.IC2_POWER ); // Gold cable -// FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 3 ), TunnelType.IC2_POWER ); // HV cable -// FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 4 ), TunnelType.IC2_POWER ); // Tin cable + // FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 0 ), TunnelType.IC2_POWER ); // Copper cable + // FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 1 ), TunnelType.IC2_POWER ); // Glass fibre cable + // FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 2 ), TunnelType.IC2_POWER ); // Gold cable + // FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 3 ), TunnelType.IC2_POWER ); // HV cable + // FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 4 ), TunnelType.IC2_POWER ); // Tin cable /** * attune based on most redstone base items. @@ -115,15 +115,15 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry { this.addNewAttunement(new ItemStack(Blocks.HOPPER), TunnelType.ITEM); this.addNewAttunement(new ItemStack(Blocks.CHEST), TunnelType.ITEM); this.addNewAttunement(new ItemStack(Blocks.TRAPPED_CHEST), TunnelType.ITEM); -// FIXME this.addNewAttunement( this.getModItem( "extrautilities", "extractor_base", 0 ), TunnelType.ITEM ); -// FIXME this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 9 ), TunnelType.ITEM ); -// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 0 ), TunnelType.ITEM ); // itemduct -// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 1 ), TunnelType.ITEM ); // itemduct -// FIXME // (opaque) -// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 2 ), TunnelType.ITEM ); // impulse -// FIXME // itemduct -// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 3 ), TunnelType.ITEM ); // impulse -// FIXME // itemduct + // FIXME this.addNewAttunement( this.getModItem( "extrautilities", "extractor_base", 0 ), TunnelType.ITEM ); + // FIXME this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 9 ), TunnelType.ITEM ); + // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 0 ), TunnelType.ITEM ); // itemduct + // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 1 ), TunnelType.ITEM ); // itemduct + // FIXME // (opaque) + // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 2 ), TunnelType.ITEM ); // impulse + // FIXME // itemduct + // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 3 ), TunnelType.ITEM ); // impulse + // FIXME // itemduct // (opaque) /** @@ -133,18 +133,18 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry { this.addNewAttunement(new ItemStack(Items.LAVA_BUCKET), TunnelType.FLUID); this.addNewAttunement(new ItemStack(Items.MILK_BUCKET), TunnelType.FLUID); this.addNewAttunement(new ItemStack(Items.WATER_BUCKET), TunnelType.FLUID); -// FIXME this.addNewAttunement( this.getModItem( "mekanism", "machineblock2", 11 ), TunnelType.FLUID ); -// FIXME this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 4 ), TunnelType.FLUID ); -// FIXME this.addNewAttunement( this.getModItem( "extrautilities", "extractor_base", 6 ), TunnelType.FLUID ); -// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 0 ), TunnelType.FLUID ); // fluiduct -// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 1 ), TunnelType.FLUID ); // fluiduct -// FIXME // (opaque) -// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 2 ), TunnelType.FLUID ); // fluiduct -// FIXME // hardened -// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 3 ), TunnelType.FLUID ); // fluiduct -// FIXME // hardened -// FIXME // (opaque) -// FIXME + // FIXME this.addNewAttunement( this.getModItem( "mekanism", "machineblock2", 11 ), TunnelType.FLUID ); + // FIXME this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 4 ), TunnelType.FLUID ); + // FIXME this.addNewAttunement( this.getModItem( "extrautilities", "extractor_base", 6 ), TunnelType.FLUID ); + // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 0 ), TunnelType.FLUID ); // fluiduct + // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 1 ), TunnelType.FLUID ); // fluiduct + // FIXME // (opaque) + // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 2 ), TunnelType.FLUID ); // fluiduct + // FIXME // hardened + // FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 3 ), TunnelType.FLUID ); // fluiduct + // FIXME // hardened + // FIXME // (opaque) + // FIXME for (final AEColor c : AEColor.values()) { this.addNewAttunement(parts.cableGlass().stack(c, 1), TunnelType.ME); this.addNewAttunement(parts.cableCovered().stack(c, 1), TunnelType.ME); diff --git a/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java index 88de2fc01..5e437971a 100644 --- a/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java +++ b/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java @@ -106,37 +106,37 @@ class GrinderRecipeCategory implements IRecipeCategory { ingredients.setOutputs(VanillaTypes.ITEM, outputs); } -// FIXME USE SPECIAL INGREDIENT TYPE -// FIXME @Override -// FIXME public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY ) -// FIXME { -// FIXME -// FIXME FontRenderer fr = Minecraft.getMinecraft().fontRenderer; -// FIXME -// FIXME int x = 118; -// FIXME -// FIXME final float scale = 0.85f; -// FIXME final float invScale = 1 / scale; -// FIXME GlStateManager.scale( scale, scale, 1 ); -// FIXME -// FIXME if( this.recipe.getOptionalOutput() != null ) -// FIXME { -// FIXME String text = String.format( "%d%%", (int) ( this.recipe.getOptionalChance() * 100 ) ); -// FIXME float width = fr.getStringWidth( text ) * scale; -// FIXME int xScaled = Math.round( ( x + ( 18 - width ) / 2 ) * invScale ); -// FIXME fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() ); -// FIXME x += 18; -// FIXME } -// FIXME -// FIXME if( this.recipe.getSecondOptionalOutput() != null ) -// FIXME { -// FIXME String text = String.format( "%d%%", (int) ( this.recipe.getSecondOptionalChance() * 100 ) ); -// FIXME float width = fr.getStringWidth( text ) * scale; -// FIXME int xScaled = Math.round( ( x + ( 18 - width ) / 2 ) * invScale ); -// FIXME fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() ); -// FIXME } -// FIXME -// FIXME GlStateManager.scale( invScale, invScale, 1 ); -// FIXME } + // FIXME USE SPECIAL INGREDIENT TYPE + // FIXME @Override + // FIXME public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY ) + // FIXME { + // FIXME + // FIXME FontRenderer fr = Minecraft.getMinecraft().fontRenderer; + // FIXME + // FIXME int x = 118; + // FIXME + // FIXME final float scale = 0.85f; + // FIXME final float invScale = 1 / scale; + // FIXME GlStateManager.scale( scale, scale, 1 ); + // FIXME + // FIXME if( this.recipe.getOptionalOutput() != null ) + // FIXME { + // FIXME String text = String.format( "%d%%", (int) ( this.recipe.getOptionalChance() * 100 ) ); + // FIXME float width = fr.getStringWidth( text ) * scale; + // FIXME int xScaled = Math.round( ( x + ( 18 - width ) / 2 ) * invScale ); + // FIXME fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() ); + // FIXME x += 18; + // FIXME } + // FIXME + // FIXME if( this.recipe.getSecondOptionalOutput() != null ) + // FIXME { + // FIXME String text = String.format( "%d%%", (int) ( this.recipe.getSecondOptionalChance() * 100 ) ); + // FIXME float width = fr.getStringWidth( text ) * scale; + // FIXME int xScaled = Math.round( ( x + ( 18 - width ) / 2 ) * invScale ); + // FIXME fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() ); + // FIXME } + // FIXME + // FIXME GlStateManager.scale( invScale, invScale, 1 ); + // FIXME } } diff --git a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java index 533e255e3..564efa95f 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java +++ b/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java @@ -47,7 +47,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow public AEBasePoweredItem(final DoubleSupplier powerCapacity, Properties props) { super(props); -// FIXME this.setFull3D(); + // FIXME this.setFull3D(); this.powerCapacity = powerCapacity; } diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index c495d8d48..48b915cde 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -1064,11 +1064,8 @@ public class Platform { if (items != null && checkFuzzy) { for (final IAEItemStack x : items) { final ItemStack sh = x.getDefinition(); - if ((Platform.itemComparisons().isEqualItemType(providedTemplate, - sh) /* FIXME || ae_req.sameOre( x ) */ ) && !ItemStack.areItemsEqual(sh, output)) { // Platform.isSameItemType( - // sh, - // providedTemplate - // ) + if ((Platform.itemComparisons().isEqualItemType(providedTemplate, sh)) + && !ItemStack.areItemsEqual(sh, output)) { final ItemStack cp = sh.copy(); cp.setCount(1); ci.setInventorySlotContents(slot, cp); diff --git a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java index d76ddd684..483de24f1 100644 --- a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java +++ b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java @@ -90,14 +90,6 @@ public class ItemComparisonHelper { return (percentDamagedOfA > mode.breakPoint) == (percentDamagedOfB > mode.breakPoint); } } -// FIXME -// final OreReference aOR = OreHelper.INSTANCE.getOre( a ).orElse( null ); -// final OreReference bOR = OreHelper.INSTANCE.getOre( b ).orElse( null ); -// -// if( OreHelper.INSTANCE.sameOre( aOR, bOR ) ) -// { -// return true; -// } return a.isItemEqual(b); }