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

Updated ids to better match vanilla conventions (#4412)

Browse Source 
Also changed related textures, models and recipes.
This commit is contained in:
yueh
2020-06-12 19:05:29 +02:00
committed by GitHub
parent 65482357f7
commit e83429e1bb
276 changed files with 729 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/crafting/CraftingCubeModel.java
+4 -4
View File
@@ -47,10 +47,10 @@ class CraftingCubeModel implements IModelGeometry<CraftingCubeModel>
private final static Material UNIT_BASE = texture( "unit_base" );
private final static Material LIGHT_BASE = texture( "light_base" );
private final static Material ACCELERATOR_LIGHT = texture( "accelerator_light" );
private final static Material STORAGE_1K_LIGHT = texture( "storage_1k_light" );
private final static Material STORAGE_4K_LIGHT = texture( "storage_4k_light" );
private final static Material STORAGE_16K_LIGHT = texture( "storage_16k_light" );
private final static Material STORAGE_64K_LIGHT = texture( "storage_64k_light" );
private final static Material STORAGE_1K_LIGHT = texture( "1k_storage_light" );
private final static Material STORAGE_4K_LIGHT = texture( "4k_storage_light" );
private final static Material STORAGE_16K_LIGHT = texture( "16k_storage_light" );
private final static Material STORAGE_64K_LIGHT = texture( "64k_storage_light" );
private final static Material MONITOR_BASE = texture( "monitor_base" );
private final static Material MONITOR_LIGHT_DARK = texture( "monitor_light_dark" );
private final static Material MONITOR_LIGHT_MEDIUM = texture( "monitor_light_medium" );
src/main/java/appeng/core/api/definitions/ApiBlocks.java
+4 -4
View File
@@ -440,22 +440,22 @@ public final class ApiBlocks implements IBlocks
TileEntityDefinition craftingStorage = registry.tileEntity("crafting_storage", TileCraftingStorageTile.class, TileCraftingStorageTile::new)
.build();
this.craftingStorage1k = crafting.block( "crafting_storage_1k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_1K ) )
this.craftingStorage1k = crafting.block( "1k_crafting_storage", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_1K ) )
.item( ItemCraftingStorage::new )
.tileEntity(craftingStorage)
.rendering( new CraftingCubeRendering() )
.build();
this.craftingStorage4k = crafting.block( "crafting_storage_4k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_4K ) )
this.craftingStorage4k = crafting.block( "4k_crafting_storage", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_4K ) )
.item( ItemCraftingStorage::new )
.tileEntity(craftingStorage)
.rendering( new CraftingCubeRendering() )
.build();
this.craftingStorage16k = crafting.block( "crafting_storage_16k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_16K ) )
this.craftingStorage16k = crafting.block( "16k_crafting_storage", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_16K ) )
.item( ItemCraftingStorage::new )
.tileEntity(craftingStorage)
.rendering( new CraftingCubeRendering() )
.build();
this.craftingStorage64k = crafting.block( "crafting_storage_64k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_64K ) )
this.craftingStorage64k = crafting.block( "64k_crafting_storage", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_64K ) )
.item( ItemCraftingStorage::new )
.tileEntity(craftingStorage)
.rendering( new CraftingCubeRendering() )
src/main/java/appeng/core/api/definitions/ApiItems.java
+13 -13
View File
@@ -135,7 +135,7 @@ public final class ApiItems implements IItems
.itemGroup(ItemGroup.TOOLS)
.addFeatures( AEFeature.QUARTZ_HOE )
.build();
this.certusQuartzShovel = certusTools.item( "certus_quartz_spade", props -> new ToolQuartzSpade( props, AEFeature.CERTUS_QUARTZ_TOOLS ) )
this.certusQuartzShovel = certusTools.item( "certus_quartz_shovel", props -> new ToolQuartzSpade( props, AEFeature.CERTUS_QUARTZ_TOOLS ) )
.itemGroup(ItemGroup.TOOLS)
.addFeatures( AEFeature.QUARTZ_SPADE )
.build();
@@ -169,7 +169,7 @@ public final class ApiItems implements IItems
.itemGroup(ItemGroup.TOOLS)
.addFeatures( AEFeature.QUARTZ_HOE )
.build();
this.netherQuartzShovel = netherTools.item( "nether_quartz_spade", props -> new ToolQuartzSpade( props, AEFeature.NETHER_QUARTZ_TOOLS ) )
this.netherQuartzShovel = netherTools.item( "nether_quartz_shovel", props -> new ToolQuartzSpade( props, AEFeature.NETHER_QUARTZ_TOOLS ) )
.itemGroup(ItemGroup.TOOLS)
.addFeatures( AEFeature.QUARTZ_SPADE )
.build();
@@ -249,20 +249,20 @@ public final class ApiItems implements IItems
.build();
FeatureFactory storageCells = registry.features( AEFeature.STORAGE_CELLS );
this.cell1k = storageCells.item( "storage_cell_1k", props -> new BasicItemStorageCell(props, MaterialType.CELL1K_PART, 1 ) ).build();
this.cell4k = storageCells.item( "storage_cell_4k", props -> new BasicItemStorageCell(props, MaterialType.CELL4K_PART, 4 ) ).build();
this.cell16k = storageCells.item( "storage_cell_16k", props -> new BasicItemStorageCell(props, MaterialType.CELL16K_PART, 16 ) ).build();
this.cell64k = storageCells.item( "storage_cell_64k", props -> new BasicItemStorageCell(props, MaterialType.CELL64K_PART, 64 ) ).build();
this.cell1k = storageCells.item( "1k_storage_cell", props -> new BasicItemStorageCell(props, MaterialType.ITEM_1K_CELL_COMPONENT, 1 ) ).build();
this.cell4k = storageCells.item( "4k_storage_cell", props -> new BasicItemStorageCell(props, MaterialType.ITEM_4K_CELL_COMPONENT, 4 ) ).build();
this.cell16k = storageCells.item( "16k_storage_cell", props -> new BasicItemStorageCell(props, MaterialType.ITEM_16K_CELL_COMPONENT, 16 ) ).build();
this.cell64k = storageCells.item( "64k_storage_cell", props -> new BasicItemStorageCell(props, MaterialType.ITEM_64K_CELL_COMPONENT, 64 ) ).build();
this.fluidCell1k = storageCells.item( "fluid_storage_cell_1k", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_CELL1K_PART, 1 ) ).build();
this.fluidCell4k = storageCells.item( "fluid_storage_cell_4k", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_CELL4K_PART, 4 ) ).build();
this.fluidCell16k = storageCells.item( "fluid_storage_cell_16k", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_CELL16K_PART, 16 ) ).build();
this.fluidCell64k = storageCells.item( "fluid_storage_cell_64k", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_CELL64K_PART, 64 ) ).build();
this.fluidCell1k = storageCells.item( "1k_fluid_storage_cell", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_1K_CELL_COMPONENT, 1 ) ).build();
this.fluidCell4k = storageCells.item( "4k_fluid_storage_cell", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_4K_CELL_COMPONENT, 4 ) ).build();
this.fluidCell16k = storageCells.item( "16k_fluid_storage_cell", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_16K_CELL_COMPONENT, 16 ) ).build();
this.fluidCell64k = storageCells.item( "64k_fluid_storage_cell", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_64K_CELL_COMPONENT, 64 ) ).build();
FeatureFactory spatialCells = registry.features( AEFeature.SPATIAL_IO );
this.spatialCell2 = spatialCells.item( "spatial_storage_cell_2_cubed", props -> new ItemSpatialStorageCell(props, 2 ) ).build();
this.spatialCell16 = spatialCells.item( "spatial_storage_cell_16_cubed", props -> new ItemSpatialStorageCell(props, 16 ) ).build();
this.spatialCell128 = spatialCells.item( "spatial_storage_cell_128_cubed", props -> new ItemSpatialStorageCell(props, 128 ) ).build();
this.spatialCell2 = spatialCells.item( "2_cubed_spatial_storage_cell", props -> new ItemSpatialStorageCell(props, 2 ) ).build();
this.spatialCell16 = spatialCells.item( "16_cubed_spatial_storage_cell", props -> new ItemSpatialStorageCell(props, 16 ) ).build();
this.spatialCell128 = spatialCells.item( "128_cubed_spatial_storage_cell", props -> new ItemSpatialStorageCell(props, 128 ) ).build();
this.facade = registry.item( "facade", ItemFacade::new )
.features( AEFeature.FACADES )
src/main/java/appeng/core/api/definitions/ApiMaterials.java
+11 -11
View File
@@ -128,9 +128,9 @@ public final class ApiMaterials implements IMaterials
.customize(builder -> builder.setTrackingRange(16).setUpdateInterval(4).setShouldReceiveVelocityUpdates(true))
.build();
this.cell2SpatialPart = createMaterial(MaterialType.CELL2_SPATIAL_PART );
this.cell16SpatialPart = createMaterial(MaterialType.CELL16_SPATIAL_PART );
this.cell128SpatialPart = createMaterial(MaterialType.CELL128_SPATIAL_PART );
this.cell2SpatialPart = createMaterial(MaterialType.SPATIAL_2_CELL_COMPONENT );
this.cell16SpatialPart = createMaterial(MaterialType.SPATIAL_16_CELL_COMPONENT );
this.cell128SpatialPart = createMaterial(MaterialType.SPATIAL_128_CELL_COMPONENT );
this.silicon = createMaterial(MaterialType.SILICON );
this.skyDust = createMaterial(MaterialType.SKY_DUST );
this.calcProcessorPress = createMaterial(MaterialType.CALCULATION_PROCESSOR_PRESS );
@@ -150,10 +150,10 @@ public final class ApiMaterials implements IMaterials
this.purifiedCertusQuartzCrystal = createMaterial(MaterialType.PURIFIED_CERTUS_QUARTZ_CRYSTAL );
this.purifiedNetherQuartzCrystal = createMaterial(MaterialType.PURIFIED_NETHER_QUARTZ_CRYSTAL );
this.purifiedFluixCrystal = createMaterial(MaterialType.PURIFIED_FLUIX_CRYSTAL );
this.cell1kPart = createMaterial(MaterialType.CELL1K_PART );
this.cell4kPart = createMaterial(MaterialType.CELL4K_PART );
this.cell16kPart = createMaterial(MaterialType.CELL16K_PART );
this.cell64kPart = createMaterial(MaterialType.CELL64K_PART );
this.cell1kPart = createMaterial(MaterialType.ITEM_1K_CELL_COMPONENT );
this.cell4kPart = createMaterial(MaterialType.ITEM_4K_CELL_COMPONENT );
this.cell16kPart = createMaterial(MaterialType.ITEM_16K_CELL_COMPONENT );
this.cell64kPart = createMaterial(MaterialType.ITEM_64K_CELL_COMPONENT );
this.emptyStorageCell = createMaterial(MaterialType.EMPTY_STORAGE_CELL );
this.cardRedstone = createMaterial(MaterialType.CARD_REDSTONE );
this.cardSpeed = createMaterial(MaterialType.CARD_SPEED );
@@ -181,10 +181,10 @@ public final class ApiMaterials implements IMaterials
this.singularity = createMaterial(MaterialType.SINGULARITY );
this.qESingularity = createMaterial(MaterialType.QUANTUM_ENTANGLED_SINGULARITY );
this.blankPattern = createMaterial(MaterialType.BLANK_PATTERN );
this.fluidCell1kPart = createMaterial(MaterialType.FLUID_CELL1K_PART );
this.fluidCell4kPart = createMaterial(MaterialType.FLUID_CELL4K_PART );
this.fluidCell16kPart = createMaterial(MaterialType.FLUID_CELL16K_PART );
this.fluidCell64kPart = createMaterial(MaterialType.FLUID_CELL64K_PART );
this.fluidCell1kPart = createMaterial(MaterialType.FLUID_1K_CELL_COMPONENT );
this.fluidCell4kPart = createMaterial(MaterialType.FLUID_4K_CELL_COMPONENT );
this.fluidCell16kPart = createMaterial(MaterialType.FLUID_16K_CELL_COMPONENT );
this.fluidCell64kPart = createMaterial(MaterialType.FLUID_64K_CELL_COMPONENT );
}
private IItemDefinition createMaterial(final MaterialType mat)
src/main/java/appeng/core/api/definitions/ApiParts.java
-8
View File
@@ -326,14 +326,6 @@ public final class ApiParts implements IParts
return this.p2PTunnelLight;
}
/*
* @Override
* public IItemDefinition p2PTunnelOpenComputers()
* {
* return this.p2PTunnelOpenComputers;
* }
*/
@Override
public IItemDefinition cableAnchor()
{
src/main/java/appeng/fluids/items/BasicFluidStorageCell.java
+4 -4
View File
@@ -49,19 +49,19 @@ public final class BasicFluidStorageCell extends AbstractStorageCell<IAEFluidSta
super( props, whichCell, kilobytes );
switch( whichCell )
{
case FLUID_CELL1K_PART:
case FLUID_1K_CELL_COMPONENT:
this.idleDrain = 0.5;
this.perType = 8;
break;
case FLUID_CELL4K_PART:
case FLUID_4K_CELL_COMPONENT:
this.idleDrain = 1.0;
this.perType = 32;
break;
case FLUID_CELL16K_PART:
case FLUID_16K_CELL_COMPONENT:
this.idleDrain = 1.5;
this.perType = 128;
break;
case FLUID_CELL64K_PART:
case FLUID_64K_CELL_COMPONENT:
this.idleDrain = 2.0;
this.perType = 512;
break;
src/main/java/appeng/items/materials/ItemMaterial.java
+8 -8
View File
@@ -239,13 +239,13 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent,
{
switch( materialType )
{
case CELL1K_PART:
case ITEM_1K_CELL_COMPONENT:
return KILO_SCALAR;
case CELL4K_PART:
case ITEM_4K_CELL_COMPONENT:
return KILO_SCALAR * 4;
case CELL16K_PART:
case ITEM_16K_CELL_COMPONENT:
return KILO_SCALAR * 16;
case CELL64K_PART:
case ITEM_64K_CELL_COMPONENT:
return KILO_SCALAR * 64;
default:
}
@@ -257,10 +257,10 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent,
{
switch( materialType )
{
case CELL1K_PART:
case CELL4K_PART:
case CELL16K_PART:
case CELL64K_PART:
case ITEM_1K_CELL_COMPONENT:
case ITEM_4K_CELL_COMPONENT:
case ITEM_16K_CELL_COMPONENT:
case ITEM_64K_CELL_COMPONENT:
return true;
default:
}
src/main/java/appeng/items/materials/MaterialType.java
+15 -15
View File
@@ -61,12 +61,12 @@ public enum MaterialType
ENGINEERING_PROCESSOR_PRESS("engineering_processor_press", EnumSet.of( AEFeature.PRESSES ) ),
LOGIC_PROCESSOR_PRESS("logic_processor_press", EnumSet.of( AEFeature.PRESSES ) ),
CALCULATION_PROCESSOR_PRINT("calculation_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
ENGINEERING_PROCESSOR_PRINT("engineering_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
LOGIC_PROCESSOR_PRINT("logic_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
CALCULATION_PROCESSOR_PRINT("printed_calculation_processor", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
ENGINEERING_PROCESSOR_PRINT("printed_engineering_processor", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
LOGIC_PROCESSOR_PRINT("printed_logic_processor", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
SILICON_PRESS("silicon_press", EnumSet.of( AEFeature.PRESSES ) ),
SILICON_PRINT("silicon_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
SILICON_PRINT("printed_silicon", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
NAME_PRESS("name_press", EnumSet.of( AEFeature.PRESSES ) ),
@@ -85,14 +85,14 @@ public enum MaterialType
CARD_SPEED("speed_card", EnumSet.of( AEFeature.ADVANCED_CARDS ) ),
CARD_INVERTER("inverter_card", EnumSet.of( AEFeature.ADVANCED_CARDS ) ),
CELL2_SPATIAL_PART("spatial_cell2_part", EnumSet.of( AEFeature.SPATIAL_IO ) ),
CELL16_SPATIAL_PART("spatial_cell16_part", EnumSet.of( AEFeature.SPATIAL_IO ) ),
CELL128_SPATIAL_PART("spatial_cell128_part", EnumSet.of( AEFeature.SPATIAL_IO ) ),
SPATIAL_2_CELL_COMPONENT("2_cubed_spatial_cell_component", EnumSet.of( AEFeature.SPATIAL_IO ) ),
SPATIAL_16_CELL_COMPONENT("16_cubed_spatial_cell_component", EnumSet.of( AEFeature.SPATIAL_IO ) ),
SPATIAL_128_CELL_COMPONENT("128_cubed_spatial_cell_component", EnumSet.of( AEFeature.SPATIAL_IO ) ),
CELL1K_PART("cell1k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
CELL4K_PART("cell4k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
CELL16K_PART("cell16k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
CELL64K_PART("cell64k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
ITEM_1K_CELL_COMPONENT("1k_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
ITEM_4K_CELL_COMPONENT("4k_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
ITEM_16K_CELL_COMPONENT("16k_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
ITEM_64K_CELL_COMPONENT("64k_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
EMPTY_STORAGE_CELL("empty_storage_cell", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
WOODEN_GEAR("wooden_gear", EnumSet.of( AEFeature.GRIND_STONE ), "gearWood" ),
@@ -112,10 +112,10 @@ public enum MaterialType
BLANK_PATTERN("blank_pattern", EnumSet.of( AEFeature.PATTERNS ) ),
CARD_CRAFTING("crafting_card", EnumSet.of( AEFeature.ADVANCED_CARDS, AEFeature.CRAFTING_CPU ) ),
FLUID_CELL1K_PART("fluid_cell1k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
FLUID_CELL4K_PART("fluid_cell4k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
FLUID_CELL16K_PART("fluid_cell16k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
FLUID_CELL64K_PART("fluid_cell64k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) );
FLUID_1K_CELL_COMPONENT("1k_fluid_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
FLUID_4K_CELL_COMPONENT("4k_fluid_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
FLUID_16K_CELL_COMPONENT("16k_fluid_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
FLUID_64K_CELL_COMPONENT("64k_fluid_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) );
private final Set<AEFeature> features;
private final ResourceLocation registryName;
src/main/java/appeng/items/storage/BasicItemStorageCell.java
+4 -4
View File
@@ -41,19 +41,19 @@ public final class BasicItemStorageCell extends AbstractStorageCell<IAEItemStack
super( props, whichCell, kilobytes );
switch( whichCell )
{
case CELL1K_PART:
case ITEM_1K_CELL_COMPONENT:
this.idleDrain = 0.5;
this.perType = 8;
break;
case CELL4K_PART:
case ITEM_4K_CELL_COMPONENT:
this.idleDrain = 1.0;
this.perType = 32;
break;
case CELL16K_PART:
case ITEM_16K_CELL_COMPONENT:
this.idleDrain = 1.5;
this.perType = 128;
break;
case CELL64K_PART:
case ITEM_64K_CELL_COMPONENT:
this.idleDrain = 2.0;
this.perType = 512;
break;