Skip to content

Commit

Permalink
Add proper pulverizer model
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rearth
Rearth committed Feb 25, 2024
1 parent 23791da commit a80498b
Show file tree
Hide file tree
Showing 7 changed files with 267 additions and 323 deletions.
5 changes: 4 additions & 1 deletion src/main/java/rearth/oritech/block/base/entity/UpgradableMachineBlockEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,10 @@ private List<AddonBlock> getAllAddons() {

// if the candidate is not an addon
if (!(candidate.getBlock() instanceof MachineAddonBlock addonBlock) || !(candidateEntity instanceof AddonBlockEntity candidateAddonEntity)) {
openSlots.add(candidatePos);

// if the block is not part of the machine itself
if (!candidatePos.equals(pos))
openSlots.add(candidatePos);
continue;
}

Expand Down
16 changes: 13 additions & 3 deletions src/main/java/rearth/oritech/block/entity/machines/PulverizerBlockEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,13 @@ public InventorySlotAssignment getSlots() {
public List<GuiSlot> getGuiSlots() {
return List.of(
new GuiSlot(0, 80, 11),
new GuiSlot(1, 80, 59),
new GuiSlot(2, 100, 59));
new GuiSlot(1, 70, 59),
new GuiSlot(2, 90, 59));
}

@Override
public boolean inputOptionsEnabled() {
return false;
}

@Override
Expand All @@ -50,7 +55,12 @@ public int getInventorySize() {
@Override
public List<Vec3i> getAddonSlots() {
return List.of(
new Vec3i(0, 0,1)
new Vec3i(-1, 0,0)
);
}

@Override
public float getCoreQuality() {
return 2;
}
}
207 changes: 197 additions & 10 deletions src/main/resources/assets/oritech/animations/block/models/pulverizer_block.animation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,224 @@
"format_version": "1.8.0",
"animations": {
"idle": {
"loop": true
"animation_length": 0.25
},
"working": {
"loop": true,
"animation_length": 3,
"bones": {
"wheel_a": {
"gear": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"3.0": {
"vector": [0, -960, 0],
"easing": "easeInOutSine"
}
}
},
"gear2": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"3.0": {
"vector": [0, 960, 0],
"easing": "easeInOutSine"
}
}
},
"front_frame": {
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.125": {
"vector": [0, 0, 0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"0.2917": {
"vector": [0, 0, -0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"0.4583": {
"vector": [0, 0, 0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"0.625": {
"vector": [0, 0, -0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"0.7917": {
"vector": [0, 0, 0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"0.9583": {
"vector": [0, 0, -0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"1.1667": {
"vector": [0, 0, -0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"1.3333": {
"vector": [0, 0, 0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"1.5": {
"vector": [180, 0, 0],
"easing": "easeInQuad"
"vector": [0, 0, -0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"1.625": {
"vector": [0, 0, 0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"1.7917": {
"vector": [0, 0, -0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"1.9583": {
"vector": [0, 0, 0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"2.125": {
"vector": [0, 0, -0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"2.2917": {
"vector": [0, 0, 0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"2.4583": {
"vector": [0, 0, -0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"2.625": {
"vector": [0, 0, 0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"2.7917": {
"vector": [0, 0, -0.04],
"easing": "easeInOutElastic",
"easingArgs": [2]
},
"3.0": {
"vector": [360, 0, 0],
"easing": "easeOutQuad"
"vector": [0, 0, 0]
}
}
},
"wheel_b": {
"beam_inner": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"1.5": {
"vector": [270, 0, 0]
"3.0": {
"vector": [0, 2700, 0]
}
}
},
"top_holder": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.125": {
"vector": [0, -2, 0],
"easing": "easeInBounce"
},
"0.25": {
"vector": [0, 1, 0],
"easing": "easeInBounce"
},
"0.375": {
"vector": [0, -4, 0],
"easing": "easeInBounce"
},
"0.5": {
"vector": [0, 0.45313, -2]
},
"0.5417": {
"vector": [0, 1, 0],
"easing": "easeInBounce"
},
"0.7083": {
"vector": [0, -1, 0],
"easing": "easeInBounce"
},
"0.875": {
"vector": [0, 1, 0],
"easing": "easeInBounce"
},
"1.0417": {
"vector": [0, -2, 0],
"easing": "easeInBounce"
},
"1.0833": {
"vector": [0, 0.52083, 1]
},
"1.1667": {
"vector": [0, 1, 0],
"easing": "easeInBounce"
},
"1.2917": {
"vector": [0, -4, 0],
"easing": "easeInBounce"
},
"1.4583": {
"vector": [0, 1, 0],
"easing": "easeInBounce"
},
"1.625": {
"vector": [0, -1, 0],
"easing": "easeInBounce"
},
"1.7917": {
"vector": [0, 1, 0],
"easing": "easeInBounce"
},
"1.9583": {
"vector": [0, -2, -2.5],
"easing": "easeInBounce"
},
"2.0833": {
"vector": [0, 1, -2.5],
"easing": "easeInBounce"
},
"2.2083": {
"vector": [0, -4, 0],
"easing": "easeInBounce"
},
"2.375": {
"vector": [0, 1, 0],
"easing": "easeInBounce"
},
"2.5417": {
"vector": [0, -1, 2.5],
"easing": "easeInBounce"
},
"2.7083": {
"vector": [0, 1, 0],
"easing": "easeInBounce"
},
"3.0": {
"vector": [720, 0, 0]
"vector": [0, 0, 0]
}
}
}
Expand Down
Loading

0 comments on commit a80498b

Please sign in to comment.