mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-10 20:45:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Thank you weakref, very deterministic

Browse Source 
- Cart controller safety #669, #684, #702, #708, #709, #714, #719, #722, #725, #728
- Update Registrate #662, #677, #697, #726
- Fixed blocks not able to be placed onto a face with super glue
- Fixed block duplication involving super glue #681, #682
- Fixed fluid tanks voiding content on contrapion disassembly #707
This commit is contained in:
simibubi 2021-01-13 14:16:45 +01:00
parent 3cdbf47cb9
commit 9d5ae97a0a
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@ -4,12 +4,12 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false org.gradle.daemon=false
# mod version info # mod version info
mod_version=0.3c mod_version=0.3d
minecraft_version=1.15.2 minecraft_version=1.15.2
forge_version=31.2.31 forge_version=31.2.31
# dependency versions # dependency versions
registrate_version=0.0.4.18 registrate_version=1.0.0-rc.17
jei_version=6.0.0.2 jei_version=6.0.0.2
# curseforge information # curseforge information

2
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedFluidStorage.java
View File

@ -120,7 +120,7 @@ public class MountedFluidStorage {
return; return;
SmartFluidTank inv = (SmartFluidTank) teHandler; SmartFluidTank inv = (SmartFluidTank) teHandler;
inv.setFluid(tank.getFluid()); inv.setFluid(tank.getFluid().copy());
} }
public IFluidHandler getFluidHandler() { public IFluidHandler getFluidHandler() {

7
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java
View File

@ -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;
import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType; import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType;
import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.networking.AllPackets;
import com.simibubi.create.foundation.utility.BlockFace;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@ -272,9 +273,9 @@ public class SuperGlueEntity extends Entity implements IEntityAdditionalSpawnDat
if (ray.getType() == Type.MISS) if (ray.getType() == Type.MISS)
return; return;
BlockRayTraceResult blockRay = (BlockRayTraceResult) ray; BlockRayTraceResult blockRay = (BlockRayTraceResult) ray;
if (!blockRay.getPos() BlockFace rayFace = new BlockFace(blockRay.getPos(), blockRay.getFace());
.offset(blockRay.getFace()) BlockFace hangingFace = new BlockFace(getHangingPosition(), getFacingDirection().getOpposite());
.equals(getHangingPosition())) if (!rayFace.isEquivalent(hangingFace))
return; return;
for (Hand handIn : Hand.values()) { for (Hand handIn : Hand.values()) {

2
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java
View File

@ -63,6 +63,8 @@ public class SuperGlueHandler {
ItemStack itemstack = placer.getHeldItemOffhand(); ItemStack itemstack = placer.getHeldItemOffhand();
if (!AllItems.SUPER_GLUE.isIn(itemstack)) if (!AllItems.SUPER_GLUE.isIn(itemstack))
return; return;
if (AllItems.WRENCH.isIn(placer.getHeldItemMainhand()))
return;
double distance = placer.getAttribute(PlayerEntity.REACH_DISTANCE) double distance = placer.getAttribute(PlayerEntity.REACH_DISTANCE)
.getValue(); .getValue();

3
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/CapabilityMinecartController.java
View File

@ -102,7 +102,8 @@ public class CapabilityMinecartController implements ICapabilitySerializable<Com
if (world.isRemote && carts.containsKey(uniqueID)) { if (world.isRemote && carts.containsKey(uniqueID)) {
MinecartController minecartController = carts.get(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! continue; // Away with you, Fake Entities!
} }