Skip to content

Commit

Permalink
The big YEET
Browse files Browse the repository at this point in the history
  • Loading branch information
@CammiePone
CammiePone committed Jul 19, 2020
1 parent 130e0dc commit 89e3668
Show file tree
Hide file tree
Showing 15 changed files with 79 additions and 40 deletions.
35 changes: 18 additions & 17 deletions src/main/java/dev/camcodes/hookshot/client/entity/model/HookshotEntityModel.java
View file
Expand Up @@ -14,33 +14,34 @@ public class HookshotEntityModel extends EntityModel<HookshotEntity>
private final ModelPart hookLeft;
private final ModelPart hookRight;

public HookshotEntityModel() {
public HookshotEntityModel()
{
textureWidth = 16;
textureHeight = 16;

hookBase = new ModelPart(this);
hookBase.setPivot(-0.5F, 23.5F, 0.5F);
hookBase.setTextureOffset(1, 2).addCuboid(-0.5F, -0.5F, -0.5F, 1.0F, 1.0F, 6.0F, 0.0F, false);
hookBase.setPivot(-0.5f, 23.5f, 0.5F);
hookBase.setTextureOffset(1, 2).addCuboid(-0.5f, -0.5f, -0.5f, 1.0f, 1.0f, 6.0f, 0.0f, false);

hookTop = new ModelPart(this);
hookTop.setPivot(0.5F, -0.5F, -0.5F);
setRotationAngle(hookTop, -0.7854F, 0.0F, 0.0F);
hookTop.setTextureOffset(0, 0).addCuboid(-1.0F, -5.0F, 0.0F, 1.0F, 5.0F, 1.0F, 0.0F, false);
hookTop.setPivot(0.5f, -0.5f, -0.5F);
setRotationAngle(hookTop, -0.7854f, 0.0f, 0.0F);
hookTop.setTextureOffset(0, 0).addCuboid(-1.0f, -5.0f, 0.0f, 1.0f, 5.0f, 1.0f, 0.0f, false);

hookBottom = new ModelPart(this);
hookBottom.setPivot(0.5F, 0.5F, -0.5F);
setRotationAngle(hookBottom, -2.3562F, 0.0F, 0.0F);
hookBottom.setTextureOffset(12, 0).addCuboid(-1.0F, -5.0F, -1.0F, 1.0F, 5.0F, 1.0F, 0.0F, false);
hookBottom.setPivot(0.5f, 0.5f, -0.5F);
setRotationAngle(hookBottom, -2.3562f, 0.0f, 0.0F);
hookBottom.setTextureOffset(12, 0).addCuboid(-1.0f, -5.0f, -1.0f, 1.0f, 5.0f, 1.0f, 0.0f, false);

hookLeft = new ModelPart(this);
hookLeft.setPivot(-0.5F, 0.5F, -0.5F);
setRotationAngle(hookLeft, 0.0F, 0.7854F, 0.0F);
hookLeft.setTextureOffset(2, 11).addCuboid(-5.0F, -1.0F, 0.0F, 5.0F, 1.0F, 1.0F, 0.0F, false);
hookLeft.setPivot(-0.5f, 0.5f, -0.5F);
setRotationAngle(hookLeft, 0.0f, 0.7854f, 0.0F);
hookLeft.setTextureOffset(2, 11).addCuboid(-5.0f, -1.0f, 0.0f, 5.0f, 1.0f, 1.0f, 0.0f, false);

hookRight = new ModelPart(this);
hookRight.setPivot(0.5F, 0.5F, -0.5F);
setRotationAngle(hookRight, 0.0F, -0.7854F, 0.0F);
hookRight.setTextureOffset(2, 14).addCuboid(0.0F, -1.0F, 0.0F, 5.0F, 1.0F, 1.0F, 0.0F, false);
hookRight.setPivot(0.5f, 0.5f, -0.5F);
setRotationAngle(hookRight, 0.0f, -0.7854f, 0.0F);
hookRight.setTextureOffset(2, 14).addCuboid(0.0f, -1.0f, 0.0f, 5.0f, 1.0f, 1.0f, 0.0f, false);

hookBase.addChild(hookTop);
hookBase.addChild(hookBottom);
Expand All @@ -51,8 +52,8 @@ public HookshotEntityModel() {
@Override
public void setAngles(HookshotEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float yaw, float pitch)
{
hookBase.pitch = pitch * 0.017453292F;
hookBase.yaw = yaw * 0.017453292F;
hookBase.yaw = yaw;
hookBase.pitch = pitch;
}

@Override
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/dev/camcodes/hookshot/client/entity/renderer/HookshotEntityRenderer.java
View file
Expand Up @@ -10,7 +10,6 @@
import net.minecraft.client.render.entity.EntityRenderer;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.MathHelper;

public class HookshotEntityRenderer extends EntityRenderer<HookshotEntity>
{
Expand All @@ -27,9 +26,7 @@ public void render(HookshotEntity hookshot, float yaw, float tickDelta, MatrixSt
{
stack.push();
stack.translate(0D, -1.5D, 0D);
this.MODEL.setAngles(hookshot, 0F, 0F, hookshot.age,
MathHelper.lerpAngleDegrees(tickDelta, hookshot.prevYaw, hookshot.yaw),
MathHelper.lerp(tickDelta, hookshot.prevPitch, hookshot.pitch));
this.MODEL.setAngles(hookshot, 0F, 0F, hookshot.age, hookshot.yaw, hookshot.pitch);
VertexConsumer vertexConsumer = provider.getBuffer(this.MODEL.getLayer(this.getTexture(hookshot)));
this.MODEL.render(stack, vertexConsumer, light, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
stack.pop();
Expand Down
18 changes: 16 additions & 2 deletions src/main/java/dev/camcodes/hookshot/common/entity/HookshotEntity.java
View file
Expand Up @@ -26,25 +26,35 @@ public class HookshotEntity extends PersistentProjectileEntity
private double maxRange = 0D;
private double maxVelocity = 0D;
private boolean isPulling = false;
private float forceYaw;
private float forcePitch;
private PlayerEntity owner;

public HookshotEntity(EntityType<? extends PersistentProjectileEntity> type, LivingEntity owner, World world)
{
super(type, owner, world);
this.forceYaw = owner.yaw;
this.forcePitch = owner.pitch;
this.setNoGravity(true);
this.setDamage(0);
}

public HookshotEntity(World world)
{
super(ModEntities.HOOKSHOT_ENTITY, world);
this.setNoGravity(true);
this.setDamage(0);
}

@Override
public void tick()
{
super.tick();

this.prevYaw = forceYaw % 360;
this.prevPitch = forcePitch % 360;
this.setRotation(forceYaw, forcePitch);

if(getOwner() instanceof PlayerEntity)
{
owner = (PlayerEntity) getOwner();
Expand Down Expand Up @@ -75,6 +85,10 @@ public void tick()
owner.velocityModified = true;
}
}
else
{
System.out.println(((PlayerProperties) owner).hasHook());
}
}
}

Expand Down Expand Up @@ -148,8 +162,8 @@ public void setProperties(Entity user, double maxRange, double maxVelocity,
float pitch, float yaw, float roll, float modifierZ, float modifierXYZ)
{
super.setProperties(user, pitch, yaw, roll, modifierZ, modifierXYZ);
this.pitch = pitch;
this.yaw = yaw;
this.forcePitch = pitch;
this.forceYaw = yaw;
this.maxRange = maxRange;
this.maxVelocity = maxVelocity;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/camcodes/hookshot/common/item/HookshotItem.java
View file
Expand Up @@ -35,7 +35,7 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
if(!((PlayerProperties) user).hasHook())
{
hookshot = new HookshotEntity(ModEntities.HOOKSHOT_ENTITY, user, world);
hookshot.setProperties(user, maxRange, maxVelocity, user.pitch, user.headYaw, 0f, 0.1f * (float) (maxVelocity / 10), 1f);
hookshot.setProperties(user, maxRange, maxVelocity, user.pitch, user.headYaw, 0f, 1.5f * (float) (maxVelocity / 10), 1f);
world.spawnEntity(hookshot);
((PlayerProperties) user).setHasHook(true);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/camcodes/hookshot/core/config/HookshotConfig.java
View file
Expand Up @@ -21,7 +21,7 @@ public class HookshotConfig
public int lsDurability = 0;

@Comment(value="The maximum range the Speedshot can reach.")
public double ssMaxRange = 24D;
public double ssMaxRange = 32D;
@Comment(value="The maximum pulling speed the Speedshot can do.")
public double ssMaxVelocity = 15D;
@Comment(value="The durability of the Speedshot.")
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/dev/camcodes/hookshot/core/packets/CreateNonLivingEntityPacket.java
View file
Expand Up @@ -63,6 +63,8 @@ public void run()
entity.updateTrackedPosition(x, y, z);
entity.pitch = pitch;
entity.yaw = yaw;
entity.prevPitch = pitch;
entity.prevYaw = yaw;
entity.setEntityId(id);
entity.setUuid(uuid);
world.addEntity(id, entity);
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/hookshot/models/entity/HookshotEntityModel.bbmodel
View file
@@ -1 +1 @@
{"meta":{"format_version":"3.2","model_format":"modded_entity","box_uv":true},"name":"HookshotEntityModel","geo_name":"HookshotEntityModel","modded_entity_version":"1.15","resolution":{"width":16,"height":16},"elements":[{"name":"cube","from":[0,0,0],"to":[1,1,6],"autouv":0,"color":5,"locked":false,"origin":[0,0,0],"uv_offset":[1,2],"faces":{"north":{"uv":[7,8,8,9],"texture":0},"east":{"uv":[1,8,7,9],"texture":0},"south":{"uv":[14,8,15,9],"texture":0},"west":{"uv":[8,8,14,9],"texture":0},"up":{"uv":[8,8,7,2],"texture":0},"down":{"uv":[9,2,8,8],"texture":0}},"uuid":"b16b547e-c6a4-9803-e95a-d219613c21c9"},{"name":"cube","from":[0,1,0],"to":[1,6,1],"autouv":1,"color":4,"locked":false,"origin":[0,1,0],"faces":{"north":{"uv":[1,1,2,6],"texture":0},"east":{"uv":[0,1,1,6],"texture":0},"south":{"uv":[3,1,4,6],"texture":0},"west":{"uv":[2,1,3,6],"texture":0},"up":{"uv":[2,1,1,0],"texture":0},"down":{"uv":[3,0,2,1],"texture":0}},"uuid":"8e1b732d-cfe4-c837-7963-2a3d6d9bcb6c"},{"name":"cube","from":[0,0,-1],"to":[1,5,0],"autouv":0,"color":3,"locked":false,"origin":[0,0,0],"uv_offset":[12,0],"faces":{"north":{"uv":[13,1,14,6],"texture":0},"east":{"uv":[12,1,13,6],"texture":0},"south":{"uv":[15,1,16,6],"texture":0},"west":{"uv":[14,1,15,6],"texture":0},"up":{"uv":[14,1,13,0],"texture":0},"down":{"uv":[15,0,14,1],"texture":0}},"uuid":"ff0d7ee9-7a72-35f6-11ff-ac233220fcfe"},{"name":"cube","from":[1,0,0],"to":[6,1,1],"autouv":0,"color":5,"locked":false,"origin":[1,0,0],"uv_offset":[2,11],"faces":{"north":{"uv":[3,12,8,13],"texture":0},"east":{"uv":[2,12,3,13],"texture":0},"south":{"uv":[9,12,14,13],"texture":0},"west":{"uv":[8,12,9,13],"texture":0},"up":{"uv":[8,12,3,11],"texture":0},"down":{"uv":[13,11,8,12],"texture":0}},"uuid":"8aa01293-fac2-de40-3d0f-1594e71f5477"},{"name":"cube","from":[-5,0,0],"to":[0,1,1],"autouv":0,"color":4,"locked":false,"origin":[0,0,0],"uv_offset":[2,14],"faces":{"north":{"uv":[3,15,8,16],"texture":0},"east":{"uv":[2,15,3,16],"texture":0},"south":{"uv":[9,15,14,16],"texture":0},"west":{"uv":[8,15,9,16],"texture":0},"up":{"uv":[8,15,3,14],"texture":0},"down":{"uv":[13,14,8,15],"texture":0}},"uuid":"1d144edb-9e7a-2b6e-ffb6-59e7f4240e35"}],"outliner":[{"name":"hookBase","uuid":"7da245c9-5c3b-49b2-de64-cc3ba5385591","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"origin":[0.5,0.5,0.5],"children":[{"name":"hookTop","uuid":"5df9dc11-ea76-d9d0-1842-383a0a8b4d7d","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"origin":[0,1,0],"rotation":[45,0,0],"children":["8e1b732d-cfe4-c837-7963-2a3d6d9bcb6c"]},{"name":"hookBottom","uuid":"36d2d41c-61bf-233a-cb44-ac0715a30426","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"origin":[0,0,0],"rotation":[135,0,0],"children":["ff0d7ee9-7a72-35f6-11ff-ac233220fcfe"]},{"name":"hookLeft","uuid":"41194c97-2112-a901-f5ed-4a05dc674fbc","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"origin":[1,0,0],"rotation":[0,-45,0],"children":["8aa01293-fac2-de40-3d0f-1594e71f5477"]},{"name":"hookRight","uuid":"d06c7e85-d12d-c571-d143-e44704ef5419","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"origin":[0,0,0],"rotation":[0,45,0],"children":["1d144edb-9e7a-2b6e-ffb6-59e7f4240e35"]},"b16b547e-c6a4-9803-e95a-d219613c21c9"]}],"textures":[{"path":"C:\\Users\\Cammie\\Desktop\\Development\\Modding\\Hookshot\\src\\main\\resources\\assets\\hookshot\\textures\\entity\\hookshot.png","name":"hookshot.png","folder":"entity","namespace":"hookshot","id":"0","particle":false,"mode":"bitmap","saved":true,"uuid":"87c28afd-d1f6-03d6-e39c-1552b7fe9589","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAnElEQVQ4T2NkYGBg2LNnz38Q7eLiwgiiCQFk9Yz/hRnAmmGA8S0DXkMw1MNMgxmA7ApsLkNXzzjwBvzfjBYGvogwwOYFDPX4QpyY2MEfbf+l/79ieMogxog7ZsAGoAckOE04x4MdBzIABC7t3YPhWFCMEZVw8HmTugZg8wo225ETG9wFsgz/wUl6/p69KHocXZzB/P1o4jBDhoEXABabYWwFGkqFAAAAAElFTkSuQmCC"}],"geckoSettings":{"entityType":"Entity","javaPackage":"com.example.mod","animFileNamespace":"MODID","animFilePath":"animations/ANIMATIONFILE.json"}}
{"meta":{"format_version":"3.2","model_format":"modded_entity","box_uv":true},"name":"HookshotEntityModel","geo_name":"HookshotEntityModel","modded_entity_version":"1.15","resolution":{"width":16,"height":16},"elements":[{"name":"cube","from":[0,0,0],"to":[1,1,6],"autouv":0,"color":5,"locked":false,"origin":[0,0,0],"uv_offset":[1,2],"faces":{"north":{"uv":[7,8,8,9],"texture":0},"east":{"uv":[1,8,7,9],"texture":0},"south":{"uv":[14,8,15,9],"texture":0},"west":{"uv":[8,8,14,9],"texture":0},"up":{"uv":[8,8,7,2],"texture":0},"down":{"uv":[9,2,8,8],"texture":0}},"uuid":"b16b547e-c6a4-9803-e95a-d219613c21c9"},{"name":"cube","from":[0,1,0],"to":[1,6,1],"autouv":1,"color":4,"locked":false,"origin":[0,1,0],"faces":{"north":{"uv":[1,1,2,6],"texture":0},"east":{"uv":[0,1,1,6],"texture":0},"south":{"uv":[3,1,4,6],"texture":0},"west":{"uv":[2,1,3,6],"texture":0},"up":{"uv":[2,1,1,0],"texture":0},"down":{"uv":[3,0,2,1],"texture":0}},"uuid":"8e1b732d-cfe4-c837-7963-2a3d6d9bcb6c"},{"name":"cube","from":[0,0,-1],"to":[1,5,0],"autouv":0,"color":3,"locked":false,"origin":[0,0,0],"uv_offset":[12,0],"faces":{"north":{"uv":[13,1,14,6],"texture":0},"east":{"uv":[12,1,13,6],"texture":0},"south":{"uv":[15,1,16,6],"texture":0},"west":{"uv":[14,1,15,6],"texture":0},"up":{"uv":[14,1,13,0],"texture":0},"down":{"uv":[15,0,14,1],"texture":0}},"uuid":"ff0d7ee9-7a72-35f6-11ff-ac233220fcfe"},{"name":"cube","from":[1,0,0],"to":[6,1,1],"autouv":0,"color":5,"locked":false,"origin":[1,0,0],"uv_offset":[2,11],"faces":{"north":{"uv":[3,12,8,13],"texture":0},"east":{"uv":[2,12,3,13],"texture":0},"south":{"uv":[9,12,14,13],"texture":0},"west":{"uv":[8,12,9,13],"texture":0},"up":{"uv":[8,12,3,11],"texture":0},"down":{"uv":[13,11,8,12],"texture":0}},"uuid":"8aa01293-fac2-de40-3d0f-1594e71f5477"},{"name":"cube","from":[-5,0,0],"to":[0,1,1],"autouv":0,"color":4,"locked":false,"origin":[0,0,0],"uv_offset":[2,14],"faces":{"north":{"uv":[3,15,8,16],"texture":0},"east":{"uv":[2,15,3,16],"texture":0},"south":{"uv":[9,15,14,16],"texture":0},"west":{"uv":[8,15,9,16],"texture":0},"up":{"uv":[8,15,3,14],"texture":0},"down":{"uv":[13,14,8,15],"texture":0}},"uuid":"1d144edb-9e7a-2b6e-ffb6-59e7f4240e35"}],"outliner":[{"name":"hookBase","uuid":"7da245c9-5c3b-49b2-de64-cc3ba5385591","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"origin":[0.5,0.5,0.5],"children":[{"name":"hookTop","uuid":"5df9dc11-ea76-d9d0-1842-383a0a8b4d7d","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"origin":[0,1,0],"rotation":[45,0,0],"children":["8e1b732d-cfe4-c837-7963-2a3d6d9bcb6c"]},{"name":"hookBottom","uuid":"36d2d41c-61bf-233a-cb44-ac0715a30426","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"origin":[0,0,0],"rotation":[135,0,0],"children":["ff0d7ee9-7a72-35f6-11ff-ac233220fcfe"]},{"name":"hookLeft","uuid":"41194c97-2112-a901-f5ed-4a05dc674fbc","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"origin":[1,0,0],"rotation":[0,-45,0],"children":["8aa01293-fac2-de40-3d0f-1594e71f5477"]},{"name":"hookRight","uuid":"d06c7e85-d12d-c571-d143-e44704ef5419","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"origin":[0,0,0],"rotation":[0,45,0],"children":["1d144edb-9e7a-2b6e-ffb6-59e7f4240e35"]},"b16b547e-c6a4-9803-e95a-d219613c21c9"]}],"textures":[{"path":"C:\\Users\\Cammie\\Desktop\\Development\\Modding\\Hookshot\\src\\main\\resources\\assets\\hookshot\\textures\\entity\\hookshot.png","name":"hookshot.png","folder":"entity","namespace":"hookshot","id":"0","particle":false,"mode":"bitmap","saved":true,"uuid":"87c28afd-d1f6-03d6-e39c-1552b7fe9589","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA9UlEQVQ4T61TMQ6CQBDcK/USEkLFR3gBUTu+wB9o1UJt+QNfoFPDC/gIFSEhOS01e8le9tZwWkh3t3Mzs7OLAgDo+/51v11hfzgqPH/7OF7hgT/IsixIIvGqbVuPoCgKR0BgTirxqmkaj6AsS0fQdZ2t5Xnu7iRe1XXtEVRV5cCkxl1JvLqcTx4BD5LUuCuJDwZGatyVnFCQgNRC47UEmPY8z2CMgWmaYBxHeD6ME1utNSRJAnEcg9YaoiiyNZzOT4sTWqz/EmArwzB4bWy2O5B3PJOPrZNgss9zSNPU9o+1/7aAY5NK+JcuqXsOaOYSTC0s5fAGYDGejZygtBQAAAAASUVORK5CYII="}],"geckoSettings":{"entityType":"Entity","javaPackage":"com.example.mod","animFileNamespace":"MODID","animFilePath":"animations/ANIMATIONFILE.json"}}
8 changes: 8 additions & 0 deletions src/main/resources/assets/hookshot/models/item/hookshot.json
View file
Expand Up @@ -229,5 +229,13 @@
}
]
}
],
"overrides": [
{
"predicate": {
"hookshot:has_hook": 1
},
"model": "hookshot:item/hookshot_hookless"
}
]
}
8 changes: 4 additions & 4 deletions src/main/resources/assets/hookshot/models/item/hookshot_hookless.json
View file
Expand Up @@ -75,12 +75,12 @@
"to": [10, 7.5, 6.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 5.5, 6.5]},
"faces": {
"north": {"uv": [0, 11, 4, 15], "texture": "#0"},
"north": {"uv": [0, 2, 4, 6], "texture": "#0"},
"east": {"uv": [0, 0, 7, 4], "texture": "#0"},
"south": {"uv": [0, 11, 4, 15], "texture": "#0"},
"south": {"uv": [0, 1, 4, 5], "texture": "#0"},
"west": {"uv": [0, 0, 7, 4], "texture": "#0"},
"up": {"uv": [4, 11, 0, 4], "texture": "#0"},
"down": {"uv": [4, 4, 0, 11], "texture": "#0"}
"up": {"uv": [4, 2, 0, 9], "texture": "#0"},
"down": {"uv": [4, 5, 0, 12], "texture": "#0"}
}
},
{
Expand Down
9 changes: 9 additions & 0 deletions src/main/resources/assets/hookshot/models/item/longshot.json
View file
Expand Up @@ -175,6 +175,7 @@
}
}
],

"display": {
"thirdperson_righthand": {
"translation": [0, 0.5, 0]
Expand Down Expand Up @@ -229,5 +230,13 @@
}
]
}
],
"overrides": [
{
"predicate": {
"hookshot:has_hook": 1
},
"model": "hookshot:item/longshot_hookless"
}
]
}
8 changes: 4 additions & 4 deletions src/main/resources/assets/hookshot/models/item/longshot_hookless.json
View file
Expand Up @@ -75,12 +75,12 @@
"to": [10, 7.5, 6.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 5.5, 6.5]},
"faces": {
"north": {"uv": [0, 11, 4, 15], "texture": "#0"},
"north": {"uv": [0, 2, 4, 6], "texture": "#0"},
"east": {"uv": [0, 0, 7, 4], "texture": "#0"},
"south": {"uv": [0, 11, 4, 15], "texture": "#0"},
"south": {"uv": [0, 1, 4, 5], "texture": "#0"},
"west": {"uv": [0, 0, 7, 4], "texture": "#0"},
"up": {"uv": [4, 11, 0, 4], "texture": "#0"},
"down": {"uv": [4, 4, 0, 11], "texture": "#0"}
"up": {"uv": [4, 9, 0, 2], "texture": "#0"},
"down": {"uv": [4, 2, 0, 9], "texture": "#0"}
}
},
{
Expand Down
10 changes: 9 additions & 1 deletion src/main/resources/assets/hookshot/models/item/speedshot.json
View file
Expand Up @@ -112,7 +112,7 @@
{
"from": [7.5, 5, -4.5],
"to": [8.5, 6, -0.5],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 5.5, -0.5]},
"rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, -0.5]},
"faces": {
"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
"east": {"uv": [4, 4, 8, 5], "texture": "#0"},
Expand Down Expand Up @@ -229,5 +229,13 @@
}
]
}
],
"overrides": [
{
"predicate": {
"hookshot:has_hook": 1
},
"model": "hookshot:item/speedshot_hookless"
}
]
}
8 changes: 4 additions & 4 deletions src/main/resources/assets/hookshot/models/item/speedshot_hookless.json
View file
Expand Up @@ -75,12 +75,12 @@
"to": [10, 7.5, 6.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 5.5, 6.5]},
"faces": {
"north": {"uv": [0, 11, 4, 15], "texture": "#0"},
"north": {"uv": [0, 4, 4, 8], "texture": "#0"},
"east": {"uv": [0, 0, 7, 4], "texture": "#0"},
"south": {"uv": [0, 11, 4, 15], "texture": "#0"},
"south": {"uv": [0, 1, 4, 5], "texture": "#0"},
"west": {"uv": [0, 0, 7, 4], "texture": "#0"},
"up": {"uv": [4, 11, 0, 4], "texture": "#0"},
"down": {"uv": [4, 4, 0, 11], "texture": "#0"}
"up": {"uv": [4, 9, 0, 2], "texture": "#0"},
"down": {"uv": [4, 5, 0, 12], "texture": "#0"}
}
},
{
Expand Down
Binary file modified src/main/resources/assets/hookshot/textures/entity/hookshot.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/main/resources/data/hookshot/recipes/speedshot.json
View file
Expand Up @@ -4,7 +4,7 @@
"item": "hookshot:hookshot"
},
"addition": {
"item": "minecraft:netherite_scrap"
"item": "minecraft:netherite_ingot"
},
"result": {
"item": "hookshot:speedshot"
Expand Down

0 comments on commit 89e3668

Please sign in to comment.