Anvilcraft/Create
2
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-09-20 08:28:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering

Browse source
This commit is contained in:
grimmauld 2021-01-13 16:34:45 +01:00
commit 07b33b66cc
22 changed files with 1241 additions and 816 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
# mod version info
mod_version=0.3c
mod_version=0.3d
minecraft_version=1.15.2
forge_version=31.2.47
# dependency versions
registrate_version=0.0.4.18
registrate_version=1.0.0-rc.17
jei_version=6.0.0.2
# curseforge information

26
src/generated/resources/.cache/cache
View file

@ -140,7 +140,7 @@ de8a40b7daf1497d5aecee47a43b3e0b1d030b00 assets/create/blockstates/fancy_scoria_
fc9ac0a7e7191b93516719455a17177fa6524ecc assets/create/blockstates/fancy_weathered_limestone_bricks_slab.json
b2a7c321b1795f20e7433f81a55ce4683de081b8 assets/create/blockstates/fancy_weathered_limestone_bricks_stairs.json
6372fe02ba0065acb0758121c45a15a1a8fdc5de assets/create/blockstates/fancy_weathered_limestone_bricks_wall.json
499aade14db59f62b46e8a266998feb41e1922a1 assets/create/blockstates/fluid_pipe.json
4c3e0500f9382d2e426e823fe876f57f4d7ee3b4 assets/create/blockstates/fluid_pipe.json
f0eaab18e16c4f3f65ebf3b55b08f0dc445720fe assets/create/blockstates/fluid_tank.json
5408d92ab02af86539ac42971d4033545970bb3a assets/create/blockstates/fluid_valve.json
e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets/create/blockstates/flywheel.json
@ -335,7 +335,7 @@ e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets/create/blockstates/powered_toggl
d06cd9a1101b18d306a786320aab12018b1325d6 assets/create/blockstates/purple_sail.json
92957119abd5fbcca36a113b2a80255fd70fc303 assets/create/blockstates/purple_seat.json
61035f8afe75ff7bbd291da5d8690bcbebe679eb assets/create/blockstates/purple_valve_handle.json
9e7ea57c58889fa0021e3c4f19da3f763108399f assets/create/blockstates/radial_chassis.json
89b63c6e5875da07226854651079bcea85439f5b assets/create/blockstates/radial_chassis.json
45877c4d90a7185c2f304edbd67379d800920439 assets/create/blockstates/red_sail.json
da1b08387af7afa0855ee8d040f620c01f20660a assets/create/blockstates/red_seat.json
722fc77bbf387af8a4016e42cbf9501d2b968881 assets/create/blockstates/red_valve_handle.json
@ -397,17 +397,17 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j
6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json
7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
ff5ca8ad030f1dd58a05c2fef2c3788292db5bd1 assets/create/lang/en_ud.json
73018587da0c54d9e99a18649c2362d2710e23b2 assets/create/lang/en_us.json
0c0bc1299211f3d16ff69da4fd33a34ccb0a6b16 assets/create/lang/unfinished/de_de.json
14bb39c5cbdd8c7522f6e1736aefe8a8bc293aec assets/create/lang/unfinished/fr_fr.json
da4442fd0d7a69396a38050d22b8a4dca24cf7c8 assets/create/lang/unfinished/it_it.json
818528da9f50888744692d263f8996a41a3539e3 assets/create/lang/unfinished/ja_jp.json
0e1f1922cc50cce5839b3bf71f32750ac605a578 assets/create/lang/unfinished/ko_kr.json
4b8198d61f4fcf384d3e6dc5188846f0a3cc3d27 assets/create/lang/unfinished/nl_nl.json
7ec32d73f5ab8fc79b19e39da587cce1458d484e assets/create/lang/unfinished/pt_br.json
6d9fa6c52474894a65a49ea25afb39a27919deec assets/create/lang/unfinished/ru_ru.json
2c86a2f313e2650ec02c8368b1ea728a65fbc530 assets/create/lang/unfinished/zh_cn.json
f11f6bc6d9284f3b995e5d250745d0a1194bc695 assets/create/lang/en_ud.json
c7ce8fb0347cc524b4497a2c251122744d66c867 assets/create/lang/en_us.json
0ded0dcda370475b7e5398da8b18a0854a4465bb assets/create/lang/unfinished/de_de.json
3b023d30bf50b7b81be0394aab9f564d54ffc1b5 assets/create/lang/unfinished/fr_fr.json
9186e35869c87606b15057e854796f3556bf8a9b assets/create/lang/unfinished/it_it.json
9abc5a7129adfcb2492b7ba10afc64d77df4397e assets/create/lang/unfinished/ja_jp.json
3e2dc7dbc703826c87efe2c340c41a14c9c400c8 assets/create/lang/unfinished/ko_kr.json
26c3e64daddecf240ace2567d79a65e93c9c960f assets/create/lang/unfinished/nl_nl.json
76f2feec509e87e0819db706b344e7e87e7b4b99 assets/create/lang/unfinished/pt_br.json
079f2c1699d4b7280e028acb51d4b6a7eca10a03 assets/create/lang/unfinished/ru_ru.json
289f948c1f44a58fd454b356a6141561e5dcf024 assets/create/lang/unfinished/zh_cn.json
846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json
1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json
1763ea2c9b981d187f5031ba608f3d5d3be3986a assets/create/models/block/acacia_window_pane_noside_alt.json

110
src/generated/resources/assets/create/blockstates/fluid_pipe.json
View file

@ -61,9 +61,9 @@
{
"when": {
"south": "false",
"north": "true",
"up": "true",
"down": "false",
"up": "true"
"north": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lu_x"
@ -72,9 +72,9 @@
{
"when": {
"south": "true",
"north": "false",
"up": "true",
"down": "false",
"up": "true"
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ru_x"
@ -83,9 +83,9 @@
{
"when": {
"south": "false",
"north": "true",
"up": "false",
"down": "true",
"up": "false"
"north": "true"
},
"apply": {
"model": "create:block/fluid_pipe/ld_x"
@ -94,9 +94,9 @@
{
"when": {
"south": "true",
"north": "false",
"up": "false",
"down": "true",
"up": "false"
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/rd_x"
@ -105,9 +105,9 @@
{
"when": {
"south": "false",
"north": "false",
"up": "true",
"down": "true",
"up": "true"
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_x"
@ -116,9 +116,9 @@
{
"when": {
"south": "false",
"north": "false",
"up": "true",
"down": "false",
"up": "true"
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_x"
@ -127,9 +127,9 @@
{
"when": {
"south": "false",
"north": "false",
"up": "false",
"down": "true",
"up": "false"
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_x"
@ -138,9 +138,9 @@
{
"when": {
"south": "true",
"north": "true",
"up": "false",
"down": "false",
"up": "false"
"north": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_x"
@ -149,9 +149,9 @@
{
"when": {
"south": "false",
"north": "true",
"up": "false",
"down": "false",
"up": "false"
"north": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_x"
@ -160,9 +160,9 @@
{
"when": {
"south": "true",
"north": "false",
"up": "false",
"down": "false",
"up": "false"
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lr_x"
@ -171,9 +171,9 @@
{
"when": {
"south": "false",
"north": "false",
"up": "false",
"down": "false",
"up": "false"
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/none_x"
@ -302,10 +302,10 @@
},
{
"when": {
"west": "false",
"east": "true",
"up": "true",
"down": "false",
"up": "true"
"west": "false",
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lu_z"
@ -313,10 +313,10 @@
},
{
"when": {
"west": "true",
"east": "false",
"up": "true",
"down": "false",
"up": "true"
"west": "true",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ru_z"
@ -324,10 +324,10 @@
},
{
"when": {
"west": "false",
"east": "true",
"up": "false",
"down": "true",
"up": "false"
"west": "false",
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/ld_z"
@ -335,10 +335,10 @@
},
{
"when": {
"west": "true",
"east": "false",
"up": "false",
"down": "true",
"up": "false"
"west": "true",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/rd_z"
@ -346,10 +346,10 @@
},
{
"when": {
"west": "false",
"east": "false",
"up": "true",
"down": "true",
"up": "true"
"west": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_z"
@ -357,10 +357,10 @@
},
{
"when": {
"west": "false",
"east": "false",
"up": "true",
"down": "false",
"up": "true"
"west": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_z"
@ -368,10 +368,10 @@
},
{
"when": {
"west": "false",
"east": "false",
"up": "false",
"down": "true",
"up": "false"
"west": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_z"
@ -379,10 +379,10 @@
},
{
"when": {
"up": "false",
"down": "false",
"west": "true",
"east": "true",
"down": "false",
"up": "false"
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_z"
@ -390,10 +390,10 @@
},
{
"when": {
"up": "false",
"down": "false",
"west": "false",
"east": "true",
"down": "false",
"up": "false"
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_z"
@ -401,10 +401,10 @@
},
{
"when": {
"up": "false",
"down": "false",
"west": "true",
"east": "false",
"down": "false",
"up": "false"
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lr_z"
@ -412,10 +412,10 @@
},
{
"when": {
"west": "false",
"east": "false",
"up": "false",
"down": "false",
"up": "false"
"west": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/none_z"

24
src/generated/resources/assets/create/blockstates/radial_chassis.json
View file

@ -89,8 +89,8 @@
},
{
"when": {
"axis": "x",
"sticky_west": "true"
"sticky_west": "true",
"axis": "x"
},
"apply": {
"model": "create:block/radial_chassis_side_x_sticky",
@ -99,8 +99,8 @@
},
{
"when": {
"axis": "y",
"sticky_west": "true"
"sticky_west": "true",
"axis": "y"
},
"apply": {
"model": "create:block/radial_chassis_side_y_sticky",
@ -109,8 +109,8 @@
},
{
"when": {
"axis": "z",
"sticky_west": "true"
"sticky_west": "true",
"axis": "z"
},
"apply": {
"model": "create:block/radial_chassis_side_z_sticky",
@ -119,8 +119,8 @@
},
{
"when": {
"axis": "x",
"sticky_west": "false"
"sticky_west": "false",
"axis": "x"
},
"apply": {
"model": "create:block/radial_chassis_side_x",
@ -129,8 +129,8 @@
},
{
"when": {
"axis": "y",
"sticky_west": "false"
"sticky_west": "false",
"axis": "y"
},
"apply": {
"model": "create:block/radial_chassis_side_y",
@ -139,8 +139,8 @@
},
{
"when": {
"axis": "z",
"sticky_west": "false"
"sticky_west": "false",
"axis": "z"
},
"apply": {
"model": "create:block/radial_chassis_side_z",

2
src/generated/resources/assets/create/lang/en_ud.json
View file

@ -402,8 +402,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",

2
src/generated/resources/assets/create/lang/en_us.json
View file

@ -407,8 +407,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",

4
src/generated/resources/assets/create/lang/unfinished/de_de.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1211",
"_": "Missing Localizations: 1209",
"_": "->------------------------] Game Elements [------------------------<-",
@ -408,8 +408,6 @@
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",

4
src/generated/resources/assets/create/lang/unfinished/fr_fr.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 862",
"_": "Missing Localizations: 860",
"_": "->------------------------] Game Elements [------------------------<-",
@ -408,8 +408,6 @@
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",

4
src/generated/resources/assets/create/lang/unfinished/it_it.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 846",
"_": "Missing Localizations: 844",
"_": "->------------------------] Game Elements [------------------------<-",
@ -408,8 +408,6 @@
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",

4
src/generated/resources/assets/create/lang/unfinished/ja_jp.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 845",
"_": "Missing Localizations: 843",
"_": "->------------------------] Game Elements [------------------------<-",
@ -408,8 +408,6 @@
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",

2
src/generated/resources/assets/create/lang/unfinished/ko_kr.json
View file

@ -408,8 +408,6 @@
"entity.create.stationary_contraption": "고정된 장치",
"entity.create.super_glue": "강력 접착제",
"fluid.create.chocolate": "초콜릿",
"fluid.create.honey": "꿀",
"fluid.create.milk": "우유",
"fluid.create.potion": "포션",
"fluid.create.tea": "건축가의 차",

4
src/generated/resources/assets/create/lang/unfinished/nl_nl.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1152",
"_": "Missing Localizations: 1150",
"_": "->------------------------] Game Elements [------------------------<-",
@ -408,8 +408,6 @@
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",

4
src/generated/resources/assets/create/lang/unfinished/pt_br.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1218",
"_": "Missing Localizations: 1216",
"_": "->------------------------] Game Elements [------------------------<-",
@ -408,8 +408,6 @@
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",

1086
src/generated/resources/assets/create/lang/unfinished/ru_ru.json
View file

File diff suppressed because it is too large Load diff

2
src/generated/resources/assets/create/lang/unfinished/zh_cn.json
View file

@ -408,8 +408,6 @@
"entity.create.stationary_contraption": "固定结构",
"entity.create.super_glue": "强力胶",
"fluid.create.chocolate": "巧克力",
"fluid.create.honey": "蜂蜜",
"fluid.create.milk": "牛奶",
"fluid.create.potion": "药水",
"fluid.create.tea": "茶",

4
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
View file

@ -832,6 +832,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);

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

@ -120,7 +120,7 @@ public class MountedFluidStorage {
return;
SmartFluidTank inv = (SmartFluidTank) teHandler;
inv.setFluid(tank.getFluid());
inv.setFluid(tank.getFluid().copy());
}
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.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;
@ -272,9 +273,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()) {

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();
if (!AllItems.SUPER_GLUE.isIn(itemstack))
return;
if (AllItems.WRENCH.isIn(placer.getHeldItemMainhand()))
return;
double distance = placer.getAttribute(PlayerEntity.REACH_DISTANCE)
.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)) {
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!
}

3
src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java
View file

@ -21,6 +21,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.Rarity;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.EntityRayTraceResult;
import net.minecraft.util.math.RayTraceResult.Type;
import net.minecraft.util.math.Vec3d;
@ -116,6 +117,8 @@ public class ExtendoGripItem extends Item {
return;
if (!isHoldingExtendoGrip(player))
return;
if (mc.objectMouseOver instanceof BlockRayTraceResult && mc.objectMouseOver.getType() != Type.MISS)
return;
// Modified version of GameRenderer#getMouseOver
double d0 = player.getAttribute(PlayerEntity.REACH_DISTANCE)

754
src/main/resources/assets/create/lang/ru_ru.json
View file

File diff suppressed because it is too large Load diff