mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-14 14:33:48 +01:00
Merge branch 'mc1.15/dev' into mc1.16/dev
This commit is contained in:
simibubi
commit
db3a579b21
20 changed files with 610 additions and 16799 deletions
|
|
@ -4,12 +4,12 @@ org.gradle.jvmargs=-Xmx3G
|
|||
org.gradle.daemon=false
|
||||
|
||||
# mod version info
|
||||
mod_version=0.3c
|
||||
mod_version=0.3d
|
||||
minecraft_version=1.16.3
|
||||
forge_version=34.1.17
|
||||
|
||||
# dependency versions
|
||||
registrate_version=1.0.0-beta.6
|
||||
registrate_version=1.0.0-beta.33
|
||||
jei_version=7.6.0.45
|
||||
|
||||
# curseforge information
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,425 +0,0 @@
|
|||
{
|
||||
"multipart": [
|
||||
{
|
||||
"when": {
|
||||
"down": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/block_end",
|
||||
"x": 180,
|
||||
"y": 90
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"up": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/block_end",
|
||||
"y": 90
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"north": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/block_end",
|
||||
"x": 90
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"south": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/block_end",
|
||||
"x": 90,
|
||||
"y": 180
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/block_end",
|
||||
"x": 90,
|
||||
"y": 270
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"east": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/block_end",
|
||||
"x": 90,
|
||||
"y": 90
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"up": "true",
|
||||
"down": "false",
|
||||
"south": "false",
|
||||
"north": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/lu_x"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"up": "true",
|
||||
"down": "false",
|
||||
"south": "true",
|
||||
"north": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ru_x"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"up": "false",
|
||||
"down": "true",
|
||||
"south": "false",
|
||||
"north": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ld_x"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"up": "false",
|
||||
"down": "true",
|
||||
"south": "true",
|
||||
"north": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/rd_x"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"up": "true",
|
||||
"down": "true",
|
||||
"south": "false",
|
||||
"north": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ud_x"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"up": "true",
|
||||
"down": "false",
|
||||
"south": "false",
|
||||
"north": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ud_x"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"up": "false",
|
||||
"down": "true",
|
||||
"south": "false",
|
||||
"north": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ud_x"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"up": "false",
|
||||
"down": "false",
|
||||
"south": "true",
|
||||
"north": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/lr_x"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"up": "false",
|
||||
"down": "false",
|
||||
"south": "false",
|
||||
"north": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/lr_x"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"up": "false",
|
||||
"down": "false",
|
||||
"south": "true",
|
||||
"north": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/lr_x"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"up": "false",
|
||||
"down": "false",
|
||||
"south": "false",
|
||||
"north": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/none_x"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "true",
|
||||
"east": "false",
|
||||
"south": "true",
|
||||
"north": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/lu_y"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"east": "true",
|
||||
"south": "true",
|
||||
"north": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ru_y"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "true",
|
||||
"east": "false",
|
||||
"south": "false",
|
||||
"north": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ld_y"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"east": "true",
|
||||
"south": "false",
|
||||
"north": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/rd_y"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"east": "false",
|
||||
"south": "true",
|
||||
"north": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ud_y"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"east": "false",
|
||||
"south": "true",
|
||||
"north": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ud_y"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"east": "false",
|
||||
"south": "false",
|
||||
"north": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ud_y"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "true",
|
||||
"east": "true",
|
||||
"south": "false",
|
||||
"north": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/lr_y"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "true",
|
||||
"east": "false",
|
||||
"south": "false",
|
||||
"north": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/lr_y"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"east": "true",
|
||||
"south": "false",
|
||||
"north": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/lr_y"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"east": "false",
|
||||
"south": "false",
|
||||
"north": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/none_y"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"east": "true",
|
||||
"up": "true",
|
||||
"down": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/lu_z"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "true",
|
||||
"east": "false",
|
||||
"up": "true",
|
||||
"down": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ru_z"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"east": "true",
|
||||
"up": "false",
|
||||
"down": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ld_z"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "true",
|
||||
"east": "false",
|
||||
"up": "false",
|
||||
"down": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/rd_z"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"east": "false",
|
||||
"up": "true",
|
||||
"down": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ud_z"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"east": "false",
|
||||
"up": "true",
|
||||
"down": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ud_z"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"east": "false",
|
||||
"up": "false",
|
||||
"down": "true"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/ud_z"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "true",
|
||||
"east": "true",
|
||||
"up": "false",
|
||||
"down": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/lr_z"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"east": "true",
|
||||
"up": "false",
|
||||
"down": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/lr_z"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "true",
|
||||
"east": "false",
|
||||
"up": "false",
|
||||
"down": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/lr_z"
|
||||
}
|
||||
},
|
||||
{
|
||||
"when": {
|
||||
"west": "false",
|
||||
"east": "false",
|
||||
"up": "false",
|
||||
"down": "false"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/fluid_pipe/none_z"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -406,8 +406,6 @@
|
|||
"entity.create.seat": "\u0287\u0250\u01DDS",
|
||||
"entity.create.stationary_contraption": "uo\u0131\u0287d\u0250\u0279\u0287uo\u0186 \u028E\u0279\u0250uo\u0131\u0287\u0250\u0287S",
|
||||
"entity.create.super_glue": "\u01DDn\u05DF\u2141 \u0279\u01DDdnS",
|
||||
"fluid.create.chocolate": "\u01DD\u0287\u0250\u05DFo\u0254o\u0265\u0186",
|
||||
"fluid.create.honey": "\u028E\u01DDuoH",
|
||||
"fluid.create.milk": "\u029E\u05DF\u0131W",
|
||||
"fluid.create.potion": "uo\u0131\u0287o\u0500",
|
||||
"fluid.create.tea": "\u0250\u01DD\u27D8 s,\u0279\u01DDp\u05DF\u0131n\u15FA",
|
||||
|
|
|
|||
|
|
@ -411,8 +411,6 @@
|
|||
"entity.create.stationary_contraption": "Stationary Contraption",
|
||||
"entity.create.super_glue": "Super Glue",
|
||||
|
||||
"fluid.create.chocolate": "Chocolate",
|
||||
"fluid.create.honey": "Honey",
|
||||
"fluid.create.milk": "Milk",
|
||||
"fluid.create.potion": "Potion",
|
||||
"fluid.create.tea": "Builder's Tea",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -412,8 +412,6 @@
|
|||
"entity.create.stationary_contraption": "고정된 장치",
|
||||
"entity.create.super_glue": "강력 접착제",
|
||||
|
||||
"fluid.create.chocolate": "초콜릿",
|
||||
"fluid.create.honey": "꿀",
|
||||
"fluid.create.milk": "우유",
|
||||
"fluid.create.potion": "포션",
|
||||
"fluid.create.tea": "건축가의 차",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -412,8 +412,6 @@
|
|||
"entity.create.stationary_contraption": "固定结构",
|
||||
"entity.create.super_glue": "强力胶",
|
||||
|
||||
"fluid.create.chocolate": "巧克力",
|
||||
"fluid.create.honey": "蜂蜜",
|
||||
"fluid.create.milk": "牛奶",
|
||||
"fluid.create.potion": "药水",
|
||||
"fluid.create.tea": "茶",
|
||||
|
|
|
|||
|
|
@ -826,6 +826,10 @@ public abstract class Contraption {
|
|||
}
|
||||
}
|
||||
}
|
||||
for (BlockInfo block : blocks.values()) {
|
||||
BlockPos targetPos = transform.apply(block.pos);
|
||||
world.markAndNotifyBlock(targetPos, null, block.state, block.state, BlockFlags.IS_MOVING | BlockFlags.DEFAULT);
|
||||
}
|
||||
|
||||
for (int i = 0; i < inventory.getSlots(); i++)
|
||||
inventory.setStackInSlot(i, ItemStack.EMPTY);
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ public class MountedFluidStorage {
|
|||
return;
|
||||
|
||||
SmartFluidTank inv = (SmartFluidTank) teHandler;
|
||||
inv.setFluid(tank.getFluid());
|
||||
inv.setFluid(tank.getFluid().copy());
|
||||
}
|
||||
|
||||
public IFluidHandler getFluidHandler() {
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import com.simibubi.create.content.schematics.ISpecialEntityItemRequirement;
|
|||
import com.simibubi.create.content.schematics.ItemRequirement;
|
||||
import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType;
|
||||
import com.simibubi.create.foundation.networking.AllPackets;
|
||||
import com.simibubi.create.foundation.utility.BlockFace;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
|
|
@ -273,9 +274,9 @@ public class SuperGlueEntity extends Entity implements IEntityAdditionalSpawnDat
|
|||
if (ray.getType() == Type.MISS)
|
||||
return;
|
||||
BlockRayTraceResult blockRay = (BlockRayTraceResult) ray;
|
||||
if (!blockRay.getPos()
|
||||
.offset(blockRay.getFace())
|
||||
.equals(getHangingPosition()))
|
||||
BlockFace rayFace = new BlockFace(blockRay.getPos(), blockRay.getFace());
|
||||
BlockFace hangingFace = new BlockFace(getHangingPosition(), getFacingDirection().getOpposite());
|
||||
if (!rayFace.isEquivalent(hangingFace))
|
||||
return;
|
||||
|
||||
for (Hand handIn : Hand.values()) {
|
||||
|
|
|
|||
|
|
@ -66,6 +66,8 @@ public class SuperGlueHandler {
|
|||
ModifiableAttributeInstance reachAttribute = placer.getAttribute(ForgeMod.REACH_DISTANCE.get());
|
||||
if (!AllItems.SUPER_GLUE.isIn(itemstack) || reachAttribute == null)
|
||||
return;
|
||||
if (AllItems.WRENCH.isIn(placer.getHeldItemMainhand()))
|
||||
return;
|
||||
|
||||
double distance = reachAttribute.getValue();
|
||||
Vector3d start = placer.getEyePosition(1);
|
||||
|
|
|
|||
|
|
@ -102,7 +102,8 @@ public class CapabilityMinecartController implements ICapabilitySerializable<Com
|
|||
|
||||
if (world.isRemote && carts.containsKey(uniqueID)) {
|
||||
MinecartController minecartController = carts.get(uniqueID);
|
||||
if (minecartController.isPresent() && minecartController.cart().getEntityId() != cart.getEntityId())
|
||||
AbstractMinecartEntity minecartEntity = minecartController.cart();
|
||||
if (minecartEntity != null && minecartEntity.getEntityId() != cart.getEntityId())
|
||||
continue; // Away with you, Fake Entities!
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue