mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-29 08:27:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev

Browse source
This commit is contained in:
grimmauld 2021-07-10 10:55:01 +02:00
commit f9a40e2f06
8 changed files with 146 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3383,7 +3383,7 @@ c2e15ac0c9109bad3face6d13efc32d7116b4c25 data/create/recipes/limestone_pillar_fr
14e322d4de8fae35d952274376497740bb3d5962 data/create/recipes/mechanical_crafting/extendo_grip.json
de7fea84434753873dfa2b929d9b5f5f86ac6a5c data/create/recipes/mechanical_crafting/flywheel.json
e491fd8a8873308270f9dc2a57ac8f2c70431dcc data/create/recipes/mechanical_crafting/furnace_engine.json
6ebd36ff54059038badefad239284ec1724fdf1d data/create/recipes/mechanical_crafting/potato_cannon.json
8e5224d22b228f69473ca48ca0d874b34660b573 data/create/recipes/mechanical_crafting/potato_cannon.json
98f877bf8f3f8a686fc6cf7479a0fba5744248ce data/create/recipes/milling/allium.json
8c7e1cbc87c7ca7df2bf949957e89422fef8ad94 data/create/recipes/milling/aluminum_ore.json
bcff4d30ae09a0729bce8b2dbde4ddd6719a998b data/create/recipes/milling/andesite.json

10
src/generated/resources/data/create/recipes/mechanical_crafting/potato_cannon.json
View file

@ -1,11 +1,8 @@
{
"type": "create:mechanical_crafting",
"pattern": [
"L",
"R",
"S",
"S",
"S"
"LRSSS",
"CC "
],
"key": {
"L": {
@ -15,6 +12,9 @@
"item": "create:precision_mechanism"
},
"S": {
"item": "create:fluid_pipe"
},
"C": {
"tag": "forge:ingots/copper"
}
},

2
src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java
View file

@ -131,7 +131,7 @@ public class PotatoCannonItem extends ShootableItem {
}
Vector3d barrelPos = ShootableGadgetItemMethods.getGunBarrelVec(player, hand == Hand.MAIN_HAND,
new Vector3d(.75f, -0.3f, 1.5f));
new Vector3d(.75f, -0.15f, 1.5f));
Vector3d correction =
ShootableGadgetItemMethods.getGunBarrelVec(player, hand == Hand.MAIN_HAND, new Vector3d(-.05f, 0, 0))
.subtract(player.getPositionVec()

15
src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileEntity.java
View file

@ -30,6 +30,7 @@ import net.minecraft.util.IndirectEntityDamageSource;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.EntityRayTraceResult;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData;
@ -46,9 +47,9 @@ public class PotatoProjectileEntity extends DamagingProjectileEntity implements
PotatoProjectileRenderMode stuckRenderer;
double stuckFallSpeed;
float additionalDamage = 0;
float additionalDamageMult = 0;
float additionalKnockback = 0;
float recoveryChance = .125f;
float recoveryChance = 0;
public PotatoProjectileEntity(EntityType<? extends DamagingProjectileEntity> type, World world) {
super(type, world);
@ -76,7 +77,7 @@ public class PotatoProjectileEntity extends DamagingProjectileEntity implements
int recovery = EnchantmentHelper.getEnchantmentLevel(AllEnchantments.POTATO_RECOVERY.get(), cannon);
if (power > 0)
additionalDamage = power * 2;
additionalDamageMult = 1 + power * .2f;
if (punch > 0)
additionalKnockback = punch * .5f;
if (flame > 0)
@ -88,7 +89,7 @@ public class PotatoProjectileEntity extends DamagingProjectileEntity implements
@Override
public void readAdditional(CompoundNBT nbt) {
stack = ItemStack.read(nbt.getCompound("Item"));
additionalDamage = nbt.getFloat("AdditionalDamage");
additionalDamageMult = nbt.getFloat("AdditionalDamage");
additionalKnockback = nbt.getFloat("AdditionalKnockback");
recoveryChance = nbt.getFloat("Recovery");
super.readAdditional(nbt);
@ -97,7 +98,7 @@ public class PotatoProjectileEntity extends DamagingProjectileEntity implements
@Override
public void writeAdditional(CompoundNBT nbt) {
nbt.put("Item", stack.serializeNBT());
nbt.putFloat("AdditionalDamage", additionalDamage);
nbt.putFloat("AdditionalDamage", additionalDamageMult);
nbt.putFloat("AdditionalKnockback", additionalKnockback);
nbt.putFloat("Recovery", recoveryChance);
super.writeAdditional(nbt);
@ -174,7 +175,7 @@ public class PotatoProjectileEntity extends DamagingProjectileEntity implements
Vector3d hit = ray.getHitVec();
Entity target = ray.getEntity();
PotatoCannonProjectileTypes projectileType = getProjectileType();
float damage = projectileType.getDamage() + additionalDamage;
float damage = MathHelper.floor(projectileType.getDamage() * additionalDamageMult);
float knockback = projectileType.getKnockback() + additionalKnockback;
Entity owner = this.getOwner();
@ -193,7 +194,7 @@ public class PotatoProjectileEntity extends DamagingProjectileEntity implements
target.setFire(5);
boolean onServer = !world.isRemote;
if (onServer && !target.attackEntityFrom(causePotatoDamage(), (float) damage)) {
if (onServer && !target.attackEntityFrom(causePotatoDamage(), damage)) {
target.setFireTicks(k);
remove();
return;

10
src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java
View file

@ -43,12 +43,10 @@ public class MechanicalCraftingRecipeGen extends CreateRecipeProvider {
POTATO_CANNON = create(AllItems.POTATO_CANNON::get).returns(1)
.recipe(b -> b.key('L', I.andesite())
.key('R', I.precisionMechanism())
.key('S', Ingredient.fromTag(I.copper()))
.patternLine("L")
.patternLine("R")
.patternLine("S")
.patternLine("S")
.patternLine("S")),
.key('S', AllBlocks.FLUID_PIPE.get())
.key('C', Ingredient.fromTag(I.copper()))
.patternLine("LRSSS")
.patternLine("CC ")),
FURNACE_ENGINE = create(AllBlocks.FURNACE_ENGINE::get).returns(1)
.recipe(b -> b.key('P', Ingredient.fromTag(I.brassSheet()))

112
src/main/resources/assets/create/models/item/potato_cannon/cog.json
View file

@ -1,104 +1,116 @@
{
"credit": "Made with Blockbench",
"parent": "create:item/potato_cannon/item",
"texture_size": [32, 32],
"textures": {
"1": "create:block/andesite_bricks",
"particle": "create:block/andesite_bricks"
"1": "create:item/potato_cannon"
},
"elements": [
{
"name": "Cog",
"from": [5.5, 8, 6.5],
"to": [10.5, 9, 9.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 8.5, 8.5]},
"rotation": {"angle": 0, "axis": "z", "origin": [8, 8.5, 7.5]},
"faces": {
"north": {"uv": [6, 15, 11, 16], "texture": "#1"},
"east": {"uv": [7, 13, 8, 16], "rotation": 270, "texture": "#1"},
"south": {"uv": [6, 14, 11, 15], "texture": "#1"},
"west": {"uv": [9, 13, 10, 16], "rotation": 90, "texture": "#1"},
"up": {"uv": [6, 13, 11, 16], "rotation": 180, "texture": "#1"},
"down": {"uv": [6, 13, 11, 16], "texture": "#1"}
}
},
{
"name": "Cog",
"from": [5.5, 8, 6.5],
"to": [10.5, 9, 9.5],
"rotation": {"angle": -45, "axis": "z", "origin": [8, 8.5, 8.5]},
"faces": {
"north": {"uv": [6, 15, 11, 16], "texture": "#1"},
"east": {"uv": [7, 13, 8, 16], "rotation": 270, "texture": "#1"},
"south": {"uv": [6, 14, 11, 15], "texture": "#1"},
"west": {"uv": [9, 13, 10, 16], "rotation": 90, "texture": "#1"},
"up": {"uv": [6, 13, 11, 16], "rotation": 180, "texture": "#1"},
"down": {"uv": [6, 13, 11, 16], "texture": "#1"}
"north": {"uv": [6.5, 9.75, 9, 10], "texture": "#1"},
"east": {"uv": [8.75, 10, 9, 8.5], "rotation": 90, "texture": "#1"},
"south": {"uv": [6.5, 8.5, 9, 8.75], "texture": "#1"},
"west": {"uv": [8.75, 8.5, 9, 10], "rotation": 90, "texture": "#1"},
"up": {"uv": [6.5, 8.5, 9, 10], "rotation": 180, "texture": "#1"},
"down": {"uv": [6.5, 8.5, 9, 10], "texture": "#1"}
}
},
{
"name": "Cog",
"from": [7.5, 6, 6.5],
"to": [8.5, 11, 9.5],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 8.5, 8.5]},
"rotation": {"angle": 0, "axis": "z", "origin": [8, 8.5, 7.5]},
"faces": {
"north": {"uv": [6, 15, 11, 16], "rotation": 270, "texture": "#1"},
"east": {"uv": [6, 13, 11, 16], "rotation": 270, "texture": "#1"},
"south": {"uv": [6, 14, 11, 15], "rotation": 90, "texture": "#1"},
"west": {"uv": [6, 13, 11, 16], "rotation": 90, "texture": "#1"},
"up": {"uv": [8, 13, 9, 16], "rotation": 180, "texture": "#1"},
"down": {"uv": [6, 13, 7, 16], "texture": "#1"}
"north": {"uv": [6.5, 9.75, 9, 10], "rotation": 90, "texture": "#1"},
"east": {"uv": [6.5, 8.5, 9, 10], "rotation": 270, "texture": "#1"},
"south": {"uv": [6.5, 8.5, 9, 8.75], "rotation": 270, "texture": "#1"},
"west": {"uv": [6.5, 8.5, 9, 10], "rotation": 90, "texture": "#1"},
"up": {"uv": [8.75, 10, 9, 8.5], "texture": "#1"},
"down": {"uv": [8.75, 8.5, 9, 10], "texture": "#1"}
}
},
{
"name": "Cog",
"from": [7.5, 6, 6.5],
"to": [8.5, 11, 9.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 8.5, 7.5]},
"faces": {
"north": {"uv": [6.5, 9.75, 9, 10], "rotation": 90, "texture": "#1"},
"east": {"uv": [6.5, 8.5, 9, 10], "rotation": 270, "texture": "#1"},
"south": {"uv": [6.5, 8.5, 9, 8.75], "rotation": 270, "texture": "#1"},
"west": {"uv": [6.5, 8.5, 9, 10], "rotation": 90, "texture": "#1"},
"up": {"uv": [8.75, 10, 9, 8.5], "texture": "#1"},
"down": {"uv": [8.75, 8.5, 9, 10], "texture": "#1"}
}
},
{
"name": "Cog",
"from": [5.5, 8, 6.5],
"to": [10.5, 9, 9.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 3.5]},
"rotation": {"angle": 45, "axis": "z", "origin": [8, 8.5, 7.5]},
"faces": {
"north": {"uv": [6, 15, 11, 16], "texture": "#1"},
"east": {"uv": [6, 13, 7, 16], "rotation": 270, "texture": "#1"},
"south": {"uv": [6, 14, 11, 15], "texture": "#1"},
"west": {"uv": [8, 13, 9, 16], "rotation": 90, "texture": "#1"},
"up": {"uv": [6, 13, 11, 16], "rotation": 180, "texture": "#1"},
"down": {"uv": [6, 13, 11, 16], "texture": "#1"}
"north": {"uv": [6.5, 9.75, 9, 10], "texture": "#1"},
"east": {"uv": [8.75, 10, 9, 8.5], "rotation": 90, "texture": "#1"},
"south": {"uv": [6.5, 8.5, 9, 8.75], "texture": "#1"},
"west": {"uv": [8.75, 8.5, 9, 10], "rotation": 90, "texture": "#1"},
"up": {"uv": [6.5, 8.5, 9, 10], "rotation": 180, "texture": "#1"},
"down": {"uv": [6.5, 8.5, 9, 10], "texture": "#1"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [0, 90, 0],
"translation": [0, 3.25, 0]
"translation": [0, 1.75, 0]
},
"thirdperson_lefthand": {
"translation": [0, 3.75, 0]
"translation": [0, 1.75, 0]
},
"firstperson_righthand": {
"rotation": [-4.5, 100.25, 10],
"translation": [1, 4, 1]
"rotation": [5, 4, 5],
"translation": [0.25, 4, 0.75]
},
"firstperson_lefthand": {
"rotation": [17.25, 267, 10],
"translation": [1, 4, 1]
"rotation": [5, 4, 5],
"translation": [0.25, 4, 0.75]
},
"ground": {
"rotation": [-90, 0, 0],
"translation": [0, -2.3, 0],
"rotation": [0, 0, 90],
"translation": [0, -1.3, 0],
"scale": [0.76914, 0.76914, 0.76914]
},
"gui": {
"rotation": [28, -163, 43],
"rotation": [64, 47, -47],
"translation": [0.5, 0, 0],
"scale": [1.09453, 1.09453, 1.09453]
"scale": [0.86, 0.86, 0.86]
},
"head": {
"translation": [0, 8, 0],
"scale": [1.4, 1.4, 1.4]
},
"fixed": {
"rotation": [0, 160.5, 0],
"translation": [0.5, 0.5, 0]
"rotation": [0, 90, 0],
"translation": [0.5, 0.5, -1],
"scale": [0.72, 0.72, 0.72]
}
},
"groups": [
{
"name": "cog",
"origin": [8, 8, 8],
"color": 0,
"children": [
{
"name": "accelerator",
"origin": [8, 8, 8],
"color": 0,
"children": [0, 1, 2, 3]
}
]
}
]
}

116
src/main/resources/assets/create/models/item/potato_cannon/item.json
View file

@ -1,73 +1,85 @@
{
"credit": "Made with Blockbench",
"parent": "block/block",
"parent": "create:item/potato_cannon/item",
"texture_size": [32, 32],
"textures": {
"2": "create:block/fluid_pipe",
"4": "create:block/andesite_casing_very_short",
"5": "create:block/andesite_casing_short",
"particle": "create:block/andesite_bricks"
"1": "create:item/potato_cannon"
},
"elements": [
{
"from": [7, 7, -2.5],
"to": [9, 10, 6.5],
"from": [6.5, 7, -1.5],
"to": [9.5, 10, 6.5],
"rotation": {"angle": 0, "axis": "y", "origin": [7, 7.6, 11]},
"faces": {
"north": {"uv": [7.5, 1, 9.5, 4], "texture": "#2"},
"east": {"uv": [0.5, 6, 3.5, 15], "rotation": 90, "texture": "#2"},
"south": {"uv": [7.5, 1, 9.5, 4], "texture": "#2"},
"west": {"uv": [0.5, 6, 3.5, 15], "rotation": 270, "texture": "#2"},
"up": {"uv": [1, 6, 3, 15], "texture": "#2"},
"down": {"uv": [1, 6, 3, 15], "rotation": 180, "texture": "#2"}
"north": {"uv": [7.5, 1, 9.5, 4], "texture": "#missing"},
"east": {"uv": [4, 2, 0, 3.5], "texture": "#1"},
"south": {"uv": [10, 6, 11.5, 7.5], "texture": "#1"},
"west": {"uv": [0, 2, 4, 3.5], "texture": "#1"},
"up": {"uv": [0, 0, 4, 1.5], "rotation": 90, "texture": "#1"},
"down": {"uv": [0, 4, 4, 5.5], "rotation": 270, "texture": "#1"}
}
},
{
"from": [7, 7, 9.5],
"to": [9, 10, 10.5],
"from": [6, 6.5, -2.5],
"to": [10, 10.5, -1.5],
"rotation": {"angle": 0, "axis": "y", "origin": [7, 7.6, 11]},
"faces": {
"north": {"uv": [4, 0.5, 6, 2.5], "texture": "#1"},
"east": {"uv": [6.25, 0.5, 5.75, 2.5], "texture": "#1"},
"south": {"uv": [4, 3.5, 6, 5.5], "texture": "#1"},
"west": {"uv": [5.75, 0.5, 6.25, 2.5], "texture": "#1"},
"up": {"uv": [4, 0.75, 6, 0.25], "texture": "#1"},
"down": {"uv": [4, 2.75, 6, 2.25], "texture": "#1"}
}
},
{
"from": [6.5, 7, 9.5],
"to": [9.5, 10, 10.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7.6, 11]},
"faces": {
"east": {"uv": [0.5, 6, 3.5, 7], "rotation": 90, "texture": "#2"},
"west": {"uv": [0.5, 6, 3.5, 7], "rotation": 270, "texture": "#2"},
"up": {"uv": [1, 6, 3, 7], "texture": "#2"},
"down": {"uv": [1, 6, 3, 7], "rotation": 180, "texture": "#2"}
"north": {"uv": [0, 6, 1.5, 7.5], "texture": "#1"},
"east": {"uv": [4, 2, 3.5, 3.5], "texture": "#1"},
"west": {"uv": [3.5, 2, 4, 3.5], "texture": "#1"},
"up": {"uv": [3.5, 0, 4, 1.5], "rotation": 90, "texture": "#1"},
"down": {"uv": [3.5, 4, 4, 5.5], "texture": "#1"}
}
},
{
"from": [6, 7, 10.5],
"to": [10, 11, 16.5],
"to": [10, 11, 15.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 9.6, 11]},
"faces": {
"north": {"uv": [7, 7, 15, 15], "rotation": 270, "texture": "#4"},
"east": {"uv": [4, 4, 12, 16], "rotation": 270, "texture": "#5"},
"south": {"uv": [7, 7, 15, 15], "rotation": 270, "texture": "#4"},
"west": {"uv": [4, 4, 12, 16], "rotation": 90, "texture": "#5"},
"up": {"uv": [4, 4, 12, 16], "rotation": 180, "texture": "#5"},
"down": {"uv": [4, 4, 12, 16], "texture": "#5"}
"north": {"uv": [10, 3.5, 12, 5.5], "texture": "#1"},
"east": {"uv": [9.5, 1, 7, 3], "texture": "#1"},
"south": {"uv": [10, 1, 12, 3], "texture": "#1"},
"west": {"uv": [7, 1, 9.5, 3], "texture": "#1"},
"up": {"uv": [7, 3.5, 9.5, 5.5], "rotation": 90, "texture": "#1"},
"down": {"uv": [7, 6, 9.5, 8], "rotation": 270, "texture": "#1"}
}
},
{
"from": [7, 4, 11.5],
"from": [7, 4, 14.5],
"to": [9, 6, 15.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7.6, 11]},
"faces": {
"north": {"uv": [13, 13, 15, 15], "texture": "#2"},
"east": {"uv": [1, 6, 3, 10], "rotation": 90, "texture": "#2"},
"west": {"uv": [1, 6, 3, 10], "rotation": 270, "texture": "#2"},
"up": {"uv": [1, 6, 3, 10], "texture": "#2"},
"down": {"uv": [1, 6, 3, 10], "rotation": 180, "texture": "#2"}
"north": {"uv": [13, 13, 15, 15], "texture": "#missing"},
"east": {"uv": [0.5, 10, 1, 11], "texture": "#1"},
"west": {"uv": [0.5, 10, 1, 11], "texture": "#1"},
"up": {"uv": [0.5, 10, 1, 10.25], "rotation": 90, "texture": "#1"},
"down": {"uv": [1.5, 10.75, 2.5, 11], "rotation": 90, "texture": "#1"}
}
},
{
"from": [6.5, 3.5, 9.5],
"from": [6.5, 3.5, 8.5],
"to": [9.5, 6.5, 14.5],
"rotation": {"angle": -45, "axis": "z", "origin": [8, 5, 11.5]},
"faces": {
"north": {"uv": [12.5, 12.5, 15.5, 15.5], "texture": "#2"},
"east": {"uv": [0.5, 6, 3.5, 11], "rotation": 90, "texture": "#2"},
"south": {"uv": [12.5, 12.5, 15.5, 15.5], "texture": "#2"},
"west": {"uv": [0.5, 6, 3.5, 11], "rotation": 270, "texture": "#2"},
"up": {"uv": [0.5, 6, 3.5, 11], "texture": "#2"},
"down": {"uv": [0.5, 6, 3.5, 11], "rotation": 180, "texture": "#2"}
"north": {"uv": [3, 6, 4.5, 7.5], "rotation": 90, "texture": "#1"},
"east": {"uv": [6, 9.25, 3, 10.75], "texture": "#1"},
"south": {"uv": [5, 6, 6.5, 7.5], "texture": "#1"},
"west": {"uv": [3, 8, 6, 9.5], "texture": "#1"},
"up": {"uv": [3, 9.5, 6, 8], "rotation": 90, "texture": "#1"},
"down": {"uv": [6, 10.75, 3, 9.25], "rotation": 90, "texture": "#1"}
}
},
{
@ -75,33 +87,29 @@
"to": [9, 10, 17.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7.6, 11]},
"faces": {
"north": {"uv": [3, 7, 1, 13], "rotation": 180, "texture": "#2"},
"east": {"uv": [1, 9, 3, 15], "texture": "#2"},
"south": {"uv": [3, 7, 1, 13], "rotation": 180, "texture": "#2"},
"west": {"uv": [3, 9, 1, 15], "texture": "#2"},
"up": {"uv": [1, 7, 3, 9], "rotation": 180, "texture": "#2"},
"down": {"uv": [1, 7, 3, 9], "texture": "#2"}
"north": {"uv": [1.25, 8, 0.25, 11], "texture": "#1"},
"east": {"uv": [2, 8, 1, 11], "texture": "#1"},
"south": {"uv": [3, 8, 2, 11], "texture": "#1"},
"west": {"uv": [1, 8, 2, 11], "texture": "#1"},
"up": {"uv": [2, 7, 3, 8], "texture": "#1"},
"down": {"uv": [1.5, 10.75, 2.5, 11], "rotation": 90, "texture": "#1"}
}
}
],
"display": {
"thirdperson_righthand": {
"translation": [0, 1.75, 0],
"scale": [0.89, 0.89, 0.89]
"translation": [0, 1.75, 0]
},
"thirdperson_lefthand": {
"translation": [0, 1.75, 0],
"scale": [0.89, 0.89, 0.89]
"translation": [0, 1.75, 0]
},
"firstperson_righthand": {
"rotation": [5, 4, 5],
"translation": [0.25, 4, 0.75],
"scale": [1, 1, 0.57]
"translation": [0.25, 4, 0.75]
},
"firstperson_lefthand": {
"rotation": [5, 4, 5],
"translation": [0.25, 4, 0.75],
"scale": [1, 1, 0.57]
"translation": [0.25, 4, 0.75]
},
"ground": {
"rotation": [0, 0, 90],
@ -110,7 +118,7 @@
},
"gui": {
"rotation": [64, 47, -47],
"translation": [0, 0.5, 0],
"translation": [0.5, 0, 0],
"scale": [0.86, 0.86, 0.86]
},
"head": {

BIN
src/main/resources/assets/create/textures/item/potato_cannon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB