Skip to content
This repository has been archived by the owner on Nov 7, 2023. It is now read-only.

Commit

Permalink
Fixed inner ring of the DHD being rotated
Browse files Browse the repository at this point in the history
  • Loading branch information
MrJake222 committed Feb 4, 2021
1 parent 6940b02 commit dce3185
Show file tree
Hide file tree
Showing 23 changed files with 261,339 additions and 265,755 deletions.
9 changes: 9 additions & 0 deletions src/main/java/mrjake/aunis/raycaster/RaycasterDHD.java
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,15 @@ protected boolean brbCheck(List<Ray> brbRayList, Vec3d lookVec, EntityPlayer pla

if (button != -1 && hand == EnumHand.MAIN_HAND) {
player.swingArm(hand);

// DHD inner ring rotation
if (button >= 19 && button < 38) {
// Inner ring
button += 11;

if (button >= 38)
button -= 19;
}

if (player.getEntityWorld().isRemote)
AunisPacketHandler.INSTANCE.sendToServer(new DHDButtonClickedToServer(pos, SymbolMilkyWayEnum.valueOf(button)));
Expand Down
63 changes: 28 additions & 35 deletions src/main/resources/assets/aunis/models/block/dhd_handheld.mtl
Original file line number Diff line number Diff line change
@@ -1,35 +1,28 @@
# Blender MTL File: 'DHD_handheld.blend'
# Material Count: 3

newmtl None
Ns 0.000000
Ka 0.000000 0.000000 0.000000
Kd 0.800000 0.800000 0.800000
Ks 0.800000 0.800000 0.800000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd aunis:dhd_handheld/symbol64

newmtl None_dhd.png
Ns 0.000000
Ka 0.000000 0.000000 0.000000
Kd 0.800000 0.800000 0.800000
Ks 0.800000 0.800000 0.800000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd aunis:dhd_handheld/dhd512

newmtl None_main.png
Ns 0.000000
Ka 0.000000 0.000000 0.000000
Kd 0.800000 0.800000 0.800000
Ks 0.800000 0.800000 0.800000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd aunis:dhd_handheld/brb128
# WaveFront *.mtl file (generated by CINEMA 4D)

newmtl None
Kd 1 1 1
Ks 1 1 1
Ns 50
illum 7

newmtl None_dhdFinal1.png
Kd 1 1 1
Ks 1 1 1
Ns 50
illum 7
map_Kd aunis:dhd_handheld/dhd512

newmtl None_red256-bright3.png
Kd 1 1 1
Ks 1 1 1
Ns 50
illum 7
map_Kd aunis:dhd_handheld/brb128

newmtl None_symbol5.png
Kd 1 1 1
Ks 1 1 1
Ns 50
illum 7
map_Kd aunis:dhd_handheld/symbol64
Loading

0 comments on commit dce3185

Please sign in to comment.