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

More stuff ingame and showing up.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-01 01:01:32 +02:00
parent 6a88728544
commit 077ff17078
864 changed files with 11515 additions and 11761 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/java/appeng/api/definitions/BlockIds.java
+109
View File
@@ -0,0 +1,109 @@
package appeng.api.definitions;
import net.minecraft.util.ResourceLocation;
import static appeng.api.definitions.IdHelper.id;
public final class BlockIds {
private BlockIds() {
}
/*
* world gen
*/
public static final ResourceLocation QUARTZ_ORE = id("quartz_ore");
public static final ResourceLocation QUARTZ_ORE_CHARGED = id("charged_quartz_ore");
public static final ResourceLocation MATRIX_FRAME = id("matrix_frame");
/*
* decorative
*/
public static final ResourceLocation QUARTZ_BLOCK = id("quartz_block");
public static final ResourceLocation QUARTZ_PILLAR = id("quartz_pillar");
public static final ResourceLocation CHISELED_QUARTZ_BLOCK = id("chiseled_quartz_block");
public static final ResourceLocation QUARTZ_GLASS = id("quartz_glass");
public static final ResourceLocation QUARTZ_VIBRANT_GLASS = id("quartz_vibrant_glass");
public static final ResourceLocation QUARTZ_FIXTURE = id("quartz_fixture");
public static final ResourceLocation FLUIX_BLOCK = id("fluix_block");
public static final ResourceLocation SKY_STONE_BLOCK = id("sky_stone_block");
public static final ResourceLocation SMOOTH_SKY_STONE_BLOCK = id("smooth_sky_stone_block");
public static final ResourceLocation SKY_STONE_BRICK = id("sky_stone_brick");
public static final ResourceLocation SKY_STONE_SMALL_BRICK = id("sky_stone_small_brick");
public static final ResourceLocation SKY_STONE_CHEST = id("sky_stone_chest");
public static final ResourceLocation SMOOTH_SKY_STONE_CHEST = id("smooth_sky_stone_chest");
public static final ResourceLocation SKY_COMPASS = id("sky_compass");
public static final ResourceLocation SKY_STONE_STAIRS = id("sky_stone_stairs");
public static final ResourceLocation SMOOTH_SKY_STONE_STAIRS = id("smooth_sky_stone_stairs");
public static final ResourceLocation SKY_STONE_BRICK_STAIRS = id("sky_stone_brick_stairs");
public static final ResourceLocation SKY_STONE_SMALL_BRICK_STAIRS = id("sky_stone_small_brick_stairs");
public static final ResourceLocation FLUIX_STAIRS = id("fluix_stairs");
public static final ResourceLocation QUARTZ_STAIRS = id("quartz_stairs");
public static final ResourceLocation CHISELED_QUARTZ_STAIRS = id("chiseled_quartz_stairs");
public static final ResourceLocation QUARTZ_PILLAR_STAIRS = id("quartz_pillar_stairs");
public static final ResourceLocation SKY_STONE_SLAB = id("sky_stone_slab");
public static final ResourceLocation SMOOTH_SKY_STONE_SLAB = id("smooth_sky_stone_slab");
public static final ResourceLocation SKY_STONE_BRICK_SLAB = id("sky_stone_brick_slab");
public static final ResourceLocation SKY_STONE_SMALL_BRICK_SLAB = id("sky_stone_small_brick_slab");
public static final ResourceLocation FLUIX_SLAB = id("fluix_slab");
public static final ResourceLocation QUARTZ_SLAB = id("quartz_slab");
public static final ResourceLocation CHISELED_QUARTZ_SLAB = id("chiseled_quartz_slab");
public static final ResourceLocation QUARTZ_PILLAR_SLAB = id("quartz_pillar_slab");
/*
* misc
*/
public static final ResourceLocation GRINDSTONE = id("grindstone");
public static final ResourceLocation CRANK = id("crank");
public static final ResourceLocation INSCRIBER = id("inscriber");
public static final ResourceLocation WIRELESS_ACCESS_POINT = id("wireless_access_point");
public static final ResourceLocation CHARGER = id("charger");
public static final ResourceLocation TINY_TNT = id("tiny_tnt");
public static final ResourceLocation SECURITY_STATION = id("security_station");
/*
* quantum Network Bridge
*/
public static final ResourceLocation QUANTUM_RING = id("quantum_ring");
public static final ResourceLocation QUANTUM_LINK = id("quantum_link");
/*
* spatial iO
*/
public static final ResourceLocation SPATIAL_PYLON = id("spatial_pylon");
public static final ResourceLocation SPATIAL_IO_PORT = id("spatial_io_port");
/*
* Bus / cables
*/
public static final ResourceLocation MULTI_PART = id("cable_bus");
/*
* machines
*/
public static final ResourceLocation CONTROLLER = id("controller");
public static final ResourceLocation DRIVE = id("drive");
public static final ResourceLocation CHEST = id("chest");
public static final ResourceLocation IFACE = id("interface");
public static final ResourceLocation FLUID_IFACE = id("fluid_interface");
public static final ResourceLocation CELL_WORKBENCH = id("cell_workbench");
public static final ResourceLocation IO_PORT = id("io_port");
public static final ResourceLocation CONDENSER = id("condenser");
public static final ResourceLocation ENERGY_ACCEPTOR = id("energy_acceptor");
public static final ResourceLocation VIBRATION_CHAMBER = id("vibration_chamber");
public static final ResourceLocation QUARTZ_GROWTH_ACCELERATOR = id("quartz_growth_accelerator");
public static final ResourceLocation ENERGY_CELL = id("energy_cell");
public static final ResourceLocation ENERGY_CELL_DENSE = id("dense_energy_cell");
public static final ResourceLocation ENERGY_CELL_CREATIVE = id("creative_energy_cell");
// rv1
public static final ResourceLocation CRAFTING_UNIT = id("crafting_unit");
public static final ResourceLocation CRAFTING_ACCELERATOR = id("crafting_accelerator");
public static final ResourceLocation CRAFTING_STORAGE1K = id("crafting_storage_1k");
public static final ResourceLocation CRAFTING_STORAGE4K = id("crafting_storage_4k");
public static final ResourceLocation CRAFTING_STORAGE16K = id("crafting_storage_16k");
public static final ResourceLocation CRAFTING_STORAGE64K = id("crafting_storage_64k");
public static final ResourceLocation CRAFTING_MONITOR = id("crafting_monitor");
public static final ResourceLocation MOLECULAR_ASSEMBLER = id("molecular_assembler");
public static final ResourceLocation LIGHT_DETECTOR = id("light_detector");
public static final ResourceLocation PAINT = id("paint");
}
src/api/java/appeng/api/definitions/IBlockDefinition.java
+4 -5
View File
@@ -19,12 +19,11 @@
package appeng.api.definitions;
import java.util.Optional;
import net.minecraft.block.Block;
import net.minecraft.item.BlockItem;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraftforge.fml.RegistryObject;
public interface IBlockDefinition extends IItemDefinition
@@ -32,12 +31,12 @@ public interface IBlockDefinition extends IItemDefinition
/**
* @return the {@link Block} implementation if applicable
*/
Optional<Block> maybeBlock();
RegistryObject<Block> maybeBlock();
/**
* @return the {@link ItemBlock} implementation if applicable
* @return the {@link BlockItem} implementation if applicable
*/
Optional<BlockItem> maybeBlockItem();
RegistryObject<BlockItem> maybeBlockItem();
/**
* Compare Block with world.
src/api/java/appeng/api/definitions/IdHelper.java
+18
View File
@@ -0,0 +1,18 @@
package appeng.api.definitions;
import net.minecraft.util.ResourceLocation;
// Private helper class to create AE2 resource locations
final class IdHelper {
private IdHelper() {
}
/**
* Creates a ResourceLocation namespaced to AE2.
*/
static ResourceLocation id(String id) {
return new ResourceLocation("appliedenergistics2", id);
}
}
src/api/java/appeng/api/parts/IPart.java
+2 -2
View File
@@ -271,13 +271,13 @@ public interface IPart extends IBoxProvider, ICustomCableConnection
public float getCableConnectionLength( AECableType cable );
/**
* same as Block.randomDisplayTick, for but parts.
* same as Block.animateTick, for but parts.
*
* @param world world of block
* @param pos location of block
* @param r random
*/
void randomDisplayTick( World world, BlockPos pos, Random r );
void animateTick( World world, BlockPos pos, Random r );
/**
* Called when placed in the world by a player, this happens before addWorld.
src/api/java/appeng/api/util/IClientHelper.java
+2 -1
View File
@@ -6,6 +6,7 @@ import java.util.List;
import appeng.api.storage.ICellInventoryHandler;
import appeng.api.storage.data.IAEStack;
import net.minecraft.util.text.ITextComponent;
public interface IClientHelper
@@ -16,6 +17,6 @@ public interface IClientHelper
* @param handler Cell handler.
* @param lines List of lines to add to.
*/
<T extends IAEStack<T>> void addCellInformation( ICellInventoryHandler<T> handler, List<String> lines );
<T extends IAEStack<T>> void addCellInformation( ICellInventoryHandler<T> handler, List<ITextComponent> lines );
}
src/api/java/appeng/api/util/IOrientableBlock.java
+2 -4
View File
@@ -41,11 +41,9 @@ public interface IOrientableBlock
/**
* @param world world of block
* @param x x pos of block
* @param y y pos of block
* @param z z pos of block
* @param pos The position of the block.
*
* @return a IOrientable if applicable
*/
IOrientable getOrientable( IBlockReader world, BlockPos z );
IOrientable getOrientable( IBlockReader world, BlockPos pos );
}