Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 31544a8086 |
@@ -157,7 +157,7 @@
|
|||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
|
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
|
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
|
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
|
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
|
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
|
<setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
|
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
|
||||||
@@ -192,7 +192,7 @@
|
|||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
|
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
|
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
|
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
|
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
|
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
|
<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
|
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
|
||||||
@@ -285,7 +285,7 @@
|
|||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
|
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
|
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
|
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
|
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
|
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
|
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
|
<setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
|
||||||
|
|||||||
@@ -67,8 +67,7 @@ public class StackSizeRenderer {
|
|||||||
final float inverseScaleFactor = 1.0f / scaleFactor;
|
final float inverseScaleFactor = 1.0f / scaleFactor;
|
||||||
final int offset = AEConfig.instance().isUseLargeFonts() ? 0 : -1;
|
final int offset = AEConfig.instance().isUseLargeFonts() ? 0 : -1;
|
||||||
|
|
||||||
TransformationMatrix tm = new TransformationMatrix(new Vector3f(0, 0, 300), // Taken from
|
TransformationMatrix tm = new TransformationMatrix(new Vector3f(0, 0, 300), // Taken from ItemRenderer.renderItemOverlayIntoGUI
|
||||||
// ItemRenderer.renderItemOverlayIntoGUI
|
|
||||||
null, new Vector3f(scaleFactor, scaleFactor, scaleFactor), null);
|
null, new Vector3f(scaleFactor, scaleFactor, scaleFactor), null);
|
||||||
|
|
||||||
RenderSystem.disableBlend();
|
RenderSystem.disableBlend();
|
||||||
|
|||||||
@@ -177,42 +177,6 @@ public final class AppEng {
|
|||||||
return this.registration.advancementTriggers;
|
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) {
|
private void startService(final String serviceName, final Thread thread) {
|
||||||
thread.setName(serviceName);
|
thread.setName(serviceName);
|
||||||
thread.setPriority(Thread.MIN_PRIORITY);
|
thread.setPriority(Thread.MIN_PRIORITY);
|
||||||
|
|||||||
@@ -1064,11 +1064,8 @@ public class Platform {
|
|||||||
if (items != null && checkFuzzy) {
|
if (items != null && checkFuzzy) {
|
||||||
for (final IAEItemStack x : items) {
|
for (final IAEItemStack x : items) {
|
||||||
final ItemStack sh = x.getDefinition();
|
final ItemStack sh = x.getDefinition();
|
||||||
if ((Platform.itemComparisons().isEqualItemType(providedTemplate,
|
if ((Platform.itemComparisons().isEqualItemType(providedTemplate, sh))
|
||||||
sh) /* FIXME || ae_req.sameOre( x ) */ ) && !ItemStack.areItemsEqual(sh, output)) { // Platform.isSameItemType(
|
&& !ItemStack.areItemsEqual(sh, output)) {
|
||||||
// sh,
|
|
||||||
// providedTemplate
|
|
||||||
// )
|
|
||||||
final ItemStack cp = sh.copy();
|
final ItemStack cp = sh.copy();
|
||||||
cp.setCount(1);
|
cp.setCount(1);
|
||||||
ci.setInventorySlotContents(slot, cp);
|
ci.setInventorySlotContents(slot, cp);
|
||||||
|
|||||||
@@ -90,14 +90,6 @@ public class ItemComparisonHelper {
|
|||||||
return (percentDamagedOfA > mode.breakPoint) == (percentDamagedOfB > mode.breakPoint);
|
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);
|
return a.isItemEqual(b);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user