mirror of
https://github.com/GTNewHorizons/StructureLib.git
synced 2026-11-19 11:49:31 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c78c61f45e | ||
|
|
fbf8cfd82c | ||
|
|
4c42e5f2a2 | ||
|
|
6795b18259 |
No files matched your search
+2
-2
@@ -59,7 +59,7 @@ artifacts {
|
|||||||
idea {
|
idea {
|
||||||
module {
|
module {
|
||||||
inheritOutputDirs = false
|
inheritOutputDirs = false
|
||||||
outputDir = compileJava.destinationDir
|
outputDir = new File(compileJava.destinationDir.parentFile.parentFile, "idea")
|
||||||
testOutputDir = compileTestJava.destinationDir
|
testOutputDir = new File(compileTestJava.destinationDir.parentFile.parentFile, "ideaTest")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
modGroup = com.gtnewhorizon
|
modGroup = com.gtnewhorizon
|
||||||
modVersion = 1.0.0
|
modVersion = 1.0.4
|
||||||
modBaseName = StructureLib
|
modBaseName = StructureLib
|
||||||
|
|
||||||
forgeVersion = 1.7.10-10.13.4.1614-1.7.10
|
forgeVersion = 1.7.10-10.13.4.1614-1.7.10
|
||||||
@@ -3,6 +3,7 @@ package com.gtnewhorizon.structurelib;
|
|||||||
import com.gtnewhorizon.structurelib.alignment.AlignmentMessage;
|
import com.gtnewhorizon.structurelib.alignment.AlignmentMessage;
|
||||||
import com.gtnewhorizon.structurelib.block.BlockHint;
|
import com.gtnewhorizon.structurelib.block.BlockHint;
|
||||||
import com.gtnewhorizon.structurelib.item.ItemBlockHint;
|
import com.gtnewhorizon.structurelib.item.ItemBlockHint;
|
||||||
|
import com.gtnewhorizon.structurelib.item.ItemConstructableTrigger;
|
||||||
import com.gtnewhorizon.structurelib.item.ItemFrontRotationTool;
|
import com.gtnewhorizon.structurelib.item.ItemFrontRotationTool;
|
||||||
import com.gtnewhorizon.structurelib.proxy.CommonProxy;
|
import com.gtnewhorizon.structurelib.proxy.CommonProxy;
|
||||||
import com.gtnewhorizon.structurelib.util.XSTR;
|
import com.gtnewhorizon.structurelib.util.XSTR;
|
||||||
@@ -45,6 +46,7 @@ public class StructureLib {
|
|||||||
static Block blockHint;
|
static Block blockHint;
|
||||||
static Item itemBlockHint;
|
static Item itemBlockHint;
|
||||||
static Item itemFrontRotationTool;
|
static Item itemFrontRotationTool;
|
||||||
|
static Item itemConstructableTrigger;
|
||||||
public static final CreativeTabs creativeTab = new CreativeTabs("structurelib") {
|
public static final CreativeTabs creativeTab = new CreativeTabs("structurelib") {
|
||||||
@Override
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
@@ -58,6 +60,7 @@ public class StructureLib {
|
|||||||
GameRegistry.registerBlock(blockHint = new BlockHint(), ItemBlockHint.class, "blockhint");
|
GameRegistry.registerBlock(blockHint = new BlockHint(), ItemBlockHint.class, "blockhint");
|
||||||
itemBlockHint = ItemBlock.getItemFromBlock(StructureLibAPI.getBlockHint());
|
itemBlockHint = ItemBlock.getItemFromBlock(StructureLibAPI.getBlockHint());
|
||||||
GameRegistry.registerItem(itemFrontRotationTool = new ItemFrontRotationTool(), itemFrontRotationTool.getUnlocalizedName());
|
GameRegistry.registerItem(itemFrontRotationTool = new ItemFrontRotationTool(), itemFrontRotationTool.getUnlocalizedName());
|
||||||
|
GameRegistry.registerItem(itemConstructableTrigger = new ItemConstructableTrigger(), itemConstructableTrigger.getUnlocalizedName());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void addClientSideChatMessages(String... messages) {
|
public static void addClientSideChatMessages(String... messages) {
|
||||||
|
|||||||
@@ -12,6 +12,22 @@ import net.minecraft.world.World;
|
|||||||
import static com.gtnewhorizon.structurelib.StructureLib.proxy;
|
import static com.gtnewhorizon.structurelib.StructureLib.proxy;
|
||||||
|
|
||||||
public class StructureLibAPI {
|
public class StructureLibAPI {
|
||||||
|
public static final int HINT_BLOCK_META_GENERIC_0 = 0;
|
||||||
|
public static final int HINT_BLOCK_META_GENERIC_1 = 1;
|
||||||
|
public static final int HINT_BLOCK_META_GENERIC_2 = 2;
|
||||||
|
public static final int HINT_BLOCK_META_GENERIC_3 = 3;
|
||||||
|
public static final int HINT_BLOCK_META_GENERIC_4 = 4;
|
||||||
|
public static final int HINT_BLOCK_META_GENERIC_5 = 5;
|
||||||
|
public static final int HINT_BLOCK_META_GENERIC_6 = 6;
|
||||||
|
public static final int HINT_BLOCK_META_GENERIC_7 = 7;
|
||||||
|
public static final int HINT_BLOCK_META_GENERIC_8 = 8;
|
||||||
|
public static final int HINT_BLOCK_META_GENERIC_9 = 9;
|
||||||
|
public static final int HINT_BLOCK_META_GENERIC_10 = 10;
|
||||||
|
public static final int HINT_BLOCK_META_GENERIC_11 = 11;
|
||||||
|
public static final int HINT_BLOCK_META_DEFAULT = 12;
|
||||||
|
public static final int HINT_BLOCK_META_AIR = 13;
|
||||||
|
public static final int HINT_BLOCK_META_NOT_AIR = 14;
|
||||||
|
public static final int HINT_BLOCK_META_ERROR = 15;
|
||||||
public static void hintParticleTinted(World w, int x, int y, int z, IIcon[] icons, short[] RGBa) {
|
public static void hintParticleTinted(World w, int x, int y, int z, IIcon[] icons, short[] RGBa) {
|
||||||
proxy.hintParticleTinted(w, x, y, z, icons, RGBa);
|
proxy.hintParticleTinted(w, x, y, z, icons, RGBa);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ public interface IAlignment extends IAlignmentLimits,IAlignmentProvider {
|
|||||||
default boolean toolSetDirection(ForgeDirection direction){
|
default boolean toolSetDirection(ForgeDirection direction){
|
||||||
if(direction==null || direction==ForgeDirection.UNKNOWN){
|
if(direction==null || direction==ForgeDirection.UNKNOWN){
|
||||||
for (int i = 0,j=getDirection().ordinal()+1, valuesLength = Direction.VALUES.length; i < valuesLength; i++) {
|
for (int i = 0,j=getDirection().ordinal()+1, valuesLength = Direction.VALUES.length; i < valuesLength; i++) {
|
||||||
if(toolSetDirection(Direction.VALUES[j%valuesLength].getForgeDirection())){
|
if (toolSetDirection(Direction.VALUES[(j + i) % valuesLength].getForgeDirection())) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -90,8 +90,8 @@ public interface IAlignment extends IAlignmentLimits,IAlignmentProvider {
|
|||||||
int flips = Flip.VALUES.length;
|
int flips = Flip.VALUES.length;
|
||||||
int rotations = Rotation.VALUES.length;
|
int rotations = Rotation.VALUES.length;
|
||||||
for (int ii = 0,jj=getFlip().ordinal(); ii < flips; ii++) {
|
for (int ii = 0,jj=getFlip().ordinal(); ii < flips; ii++) {
|
||||||
for (int i = 0,j=getRotation().ordinal()+1; i < rotations; i++) {
|
for (int i = 1, j = getRotation().ordinal(); i < rotations; i++) {
|
||||||
if(checkedSetExtendedFacing(ExtendedFacing.of(getDirection(),Rotation.VALUES[j%rotations],Flip.VALUES[jj%flips]))){
|
if (checkedSetExtendedFacing(ExtendedFacing.of(getDirection(), Rotation.VALUES[(j + i) % rotations], Flip.VALUES[(jj + ii) % flips]))) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -112,8 +112,8 @@ public interface IAlignment extends IAlignmentLimits,IAlignmentProvider {
|
|||||||
|
|
||||||
default boolean toolSetFlip(Flip flip){
|
default boolean toolSetFlip(Flip flip){
|
||||||
if(flip==null){
|
if(flip==null){
|
||||||
for (int i = 0,j=getFlip().ordinal()+1, valuesLength = Flip.VALUES.length; i < valuesLength; i++) {
|
for (int i = 1, j = getFlip().ordinal(), valuesLength = Flip.VALUES.length; i < valuesLength; i++) {
|
||||||
if(toolSetFlip(Flip.VALUES[j%valuesLength])){
|
if (checkedSetFlip(Flip.VALUES[(j + i) % valuesLength])) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -134,7 +134,7 @@ public interface IAlignment extends IAlignmentLimits,IAlignmentProvider {
|
|||||||
default boolean toolSetExtendedFacing(ExtendedFacing extendedFacing){
|
default boolean toolSetExtendedFacing(ExtendedFacing extendedFacing){
|
||||||
if(extendedFacing==null){
|
if(extendedFacing==null){
|
||||||
for (int i = 0,j=getExtendedFacing().ordinal()+1, valuesLength = ExtendedFacing.VALUES.length; i < valuesLength; i++) {
|
for (int i = 0,j=getExtendedFacing().ordinal()+1, valuesLength = ExtendedFacing.VALUES.length; i < valuesLength; i++) {
|
||||||
if(toolSetExtendedFacing(ExtendedFacing.VALUES[j%valuesLength])){
|
if (checkedSetExtendedFacing(ExtendedFacing.VALUES[(j + i)%valuesLength])){
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package com.gtnewhorizon.structurelib.item;
|
||||||
|
|
||||||
|
import com.gtnewhorizon.structurelib.StructureLib;
|
||||||
|
import com.gtnewhorizon.structurelib.alignment.constructable.ConstructableUtility;
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static com.gtnewhorizon.structurelib.StructureLib.MOD_ID;
|
||||||
|
import static net.minecraft.util.EnumChatFormatting.BLUE;
|
||||||
|
import static net.minecraft.util.StatCollector.translateToLocal;
|
||||||
|
|
||||||
|
public class ItemConstructableTrigger extends Item {
|
||||||
|
public ItemConstructableTrigger() {
|
||||||
|
setUnlocalizedName("structurelib.constructableTrigger");
|
||||||
|
setTextureName(MOD_ID + ":itemConstructableTrigger");
|
||||||
|
setCreativeTab(StructureLib.creativeTab);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
|
||||||
|
return ConstructableUtility.handle(stack, player, world, x, y, z, side);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
@Override
|
||||||
|
public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
|
||||||
|
aList.add(translateToLocal("item.structurelib.constructableTrigger.desc.0"));//Triggers Constructable Interface
|
||||||
|
aList.add(BLUE + translateToLocal("item.structurelib.constructableTrigger.desc.1"));//Shows multiblock construction details,
|
||||||
|
aList.add(BLUE + translateToLocal("item.structurelib.constructableTrigger.desc.2"));//just Use on a multiblock controller.
|
||||||
|
aList.add(BLUE + translateToLocal("item.structurelib.constructableTrigger.desc.3"));//(Sneak Use in creative to build)
|
||||||
|
aList.add(BLUE + translateToLocal("item.structurelib.constructableTrigger.desc.4"));//Quantity affects tier/mode/type
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -165,4 +165,8 @@ public interface IStructureDefinition<T> {
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static <T> StructureDefinition.Builder<T> builder() {
|
||||||
|
return StructureDefinition.builder();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package com.gtnewhorizon.structurelib.structure;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implement this and use {@link StructureUtility#withContext(IStructureElement)} in case you need to record some
|
||||||
|
* temporary states that don't need to live in your main context, which would usually live for the whole lifetime of the
|
||||||
|
* structure than just during structure check. Usually just save some few bytes, but becomes non trivial if you need to
|
||||||
|
* record too much stuff.
|
||||||
|
*
|
||||||
|
* You will have to reset the context yourself though. The API can't guess when the old context becomes invalid.
|
||||||
|
* @param <CTX> the temporary state context
|
||||||
|
*/
|
||||||
|
public interface IWithExtendedContext<CTX> {
|
||||||
|
CTX getCurrentContext();
|
||||||
|
}
|
||||||
@@ -51,7 +51,8 @@ public class StructureDefinition<T> implements IStructureDefinition<T> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds shape
|
* Adds shape
|
||||||
* +- is air/no air checks
|
* + is anything but air
|
||||||
|
* - is air checks
|
||||||
* space bar is skip
|
* space bar is skip
|
||||||
* ~ is also skip (but marks controller position, optional and logically it is a space...)
|
* ~ is also skip (but marks controller position, optional and logically it is a space...)
|
||||||
* rest needs to be defined
|
* rest needs to be defined
|
||||||
|
|||||||
@@ -13,10 +13,7 @@ import net.minecraft.util.IIcon;
|
|||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.function.BiFunction;
|
import java.util.function.*;
|
||||||
import java.util.function.Consumer;
|
|
||||||
import java.util.function.Function;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
import static java.lang.Integer.MIN_VALUE;
|
import static java.lang.Integer.MIN_VALUE;
|
||||||
|
|
||||||
@@ -558,6 +555,26 @@ public class StructureUtility {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static <T, E> IStructureElementNoPlacement<T> ofSpecificTileAdder(BiPredicate<T, E> iTileAdder, Class<E> tileClass, Block hintBlock, int hintMeta) {
|
||||||
|
if (iTileAdder == null || hintBlock == null || tileClass == null) {
|
||||||
|
throw new IllegalArgumentException();
|
||||||
|
}
|
||||||
|
return new IStructureElementNoPlacement<T>() {
|
||||||
|
@Override
|
||||||
|
public boolean check(T t, World world, int x, int y, int z) {
|
||||||
|
TileEntity tileEntity = world.getTileEntity(x, y, z);
|
||||||
|
// This used to check if it's a GT tile. Since this is now an standalone mod we no longer do this
|
||||||
|
return tileClass.isInstance(tileEntity) && iTileAdder.test(t, tileClass.cast(tileEntity));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
|
||||||
|
StructureLibAPI.hintParticle(world, x, y, z, hintBlock, hintMeta);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
// No more hatch adder. Implement it via tile adder. We could of course add a wrapper around it in gregtech, but not any more in this standalone mod.
|
// No more hatch adder. Implement it via tile adder. We could of course add a wrapper around it in gregtech, but not any more in this standalone mod.
|
||||||
|
|
||||||
//endregion
|
//endregion
|
||||||
@@ -640,6 +657,27 @@ public class StructureUtility {
|
|||||||
return ofChain(elementChain.toArray(new IStructureElement[0]));
|
return ofChain(elementChain.toArray(new IStructureElement[0]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// region context
|
||||||
|
public static <CTX, T extends IWithExtendedContext<CTX>, E extends IStructureElement<CTX>> IStructureElement<T> withContext(E elem) {
|
||||||
|
return new IStructureElement<T>() {
|
||||||
|
@Override
|
||||||
|
public boolean check(T t, World world, int x, int y, int z) {
|
||||||
|
return elem.check(t.getCurrentContext(), world, x, y, z);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
|
||||||
|
return elem.spawnHint(t.getCurrentContext(), world, x, y, z, trigger);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
|
||||||
|
return elem.placeBlock(t.getCurrentContext(), world, x, y, z, trigger);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
//endregion
|
||||||
|
|
||||||
//region defer
|
//region defer
|
||||||
|
|
||||||
public static <T> IStructureElementDeferred<T> defer(Supplier<IStructureElement<T>> to) {
|
public static <T> IStructureElementDeferred<T> defer(Supplier<IStructureElement<T>> to) {
|
||||||
|
|||||||
@@ -20,6 +20,13 @@ item.structurelib.frontRotationTool.desc.0=Triggers Front Rotation Interface
|
|||||||
item.structurelib.frontRotationTool.desc.1=Rotates only the front panel,
|
item.structurelib.frontRotationTool.desc.1=Rotates only the front panel,
|
||||||
item.structurelib.frontRotationTool.desc.2=which allows structure rotation.
|
item.structurelib.frontRotationTool.desc.2=which allows structure rotation.
|
||||||
|
|
||||||
|
item.structurelib.constructableTrigger.name=Multiblock Machine Blueprint
|
||||||
|
item.structurelib.constructableTrigger.desc.0=Triggers Constructable Interface
|
||||||
|
item.structurelib.constructableTrigger.desc.1=Shows multiblock construction details,
|
||||||
|
item.structurelib.constructableTrigger.desc.2=just Use on a multiblock controller.
|
||||||
|
item.structurelib.constructableTrigger.desc.3=(Sneak Use in creative to build)
|
||||||
|
item.structurelib.constructableTrigger.desc.4=Quantity affects tier/mode/type
|
||||||
|
|
||||||
structurelib.blockhint.desc.0=Helps while building
|
structurelib.blockhint.desc.0=Helps while building
|
||||||
structurelib.blockhint.0.name=Hint 1 dot
|
structurelib.blockhint.0.name=Hint 1 dot
|
||||||
structurelib.blockhint.1.name=Hint 2 dot
|
structurelib.blockhint.1.name=Hint 2 dot
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 667 B |
Reference in new issue
Block a user